Skip to content

Commit 310a893

Browse files
author
Bart Roossien
committed
refactor: Remove guards and add include for codex.h
1 parent 4d57f78 commit 310a893

File tree

4 files changed

+3
-21
lines changed

4 files changed

+3
-21
lines changed

Core/Libraries/Source/Compression/EAC/btreecodex.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@
1818

1919
/* Copyright (C) Electronic Arts Canada Inc. 1995-2002. All rights reserved. */
2020

21-
#ifndef __BTRCODEX
22-
#define __BTRCODEX 1
2321

2422
#ifdef __cplusplus
2523
extern "C" {
2624
#endif
2725

28-
#ifndef __CODEX_H
29-
#error "Include codex.h before btreecodex.h"
30-
#endif
26+
#include "codex.h"
3127

3228
/****************************************************************/
3329
/* BTR Codex */
@@ -58,5 +54,4 @@ int GCALL BTREE_encode(void *compresseddata, const void *source, int sour
5854
#ifdef __cplusplus
5955
}
6056
#endif
61-
#endif
6257

Core/Libraries/Source/Compression/EAC/codex.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
/* */
3838
/*------------------------------------------------------------------*/
3939

40-
#ifndef __CODEX_H
41-
#define __CODEX_H 1
4240

4341
#pragma once
4442

@@ -117,5 +115,4 @@ int GCALL CODEX_encode(void *dest, const void *source, int sourcesize, int *opts
117115
#ifdef __cplusplus
118116
}
119117
#endif
120-
#endif
121118

Core/Libraries/Source/Compression/EAC/huffcodex.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@
1818

1919
/* Copyright (C) Electronic Arts Canada Inc. 1995-2002. All rights reserved. */
2020

21-
#ifndef __HUFCODEX
22-
#define __HUFCODEX 1
2321

2422
#ifdef __cplusplus
2523
extern "C" {
2624
#endif
2725

28-
#ifndef __CODEX_H
29-
#error "Include codex.h before huffcodex.h"
30-
#endif
26+
#include "codex.h"
3127

3228
/****************************************************************/
3329
/* HUF Codex */
@@ -70,5 +66,4 @@ int GCALL HUFF_encode(void *compresseddata, const void *source, int sourc
7066
#ifdef __cplusplus
7167
}
7268
#endif
73-
#endif
7469

Core/Libraries/Source/Compression/EAC/refcodex.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@
1818

1919
/* Copyright (C) Electronic Arts Canada Inc. 1995-2002. All rights reserved. */
2020

21-
#ifndef __REFCODEX
22-
#define __REFCODEX 1
2321

2422
#ifdef __cplusplus
2523
extern "C" {
2624
#endif
2725

28-
#ifndef __CODEX_H
29-
#error "Include codex.h before refcodex.h"
30-
#endif
26+
#include "codex.h"
3127

3228
/****************************************************************/
3329
/* REF Codex */
@@ -70,5 +66,4 @@ int GCALL REF_encode(void *compresseddata, const void *source, int source
7066
#ifdef __cplusplus
7167
}
7268
#endif
73-
#endif
7469

0 commit comments

Comments
 (0)