From ebc9a4b78615cf34cf71094d70f33118cd4979c8 Mon Sep 17 00:00:00 2001 From: stag019 Date: Sat, 7 Mar 2015 16:04:07 -0500 Subject: [PATCH] Merge include/link/types.h and include/asm/types.h into include/types.h --- include/asm/asm.h | 2 +- include/asm/fstack.h | 2 +- include/asm/lexer.h | 2 +- include/asm/mymath.h | 2 +- include/asm/output.h | 2 +- include/asm/symbol.h | 2 +- include/asm/types.h | 15 --------------- include/link/assign.h | 2 +- include/link/main.h | 2 +- include/link/mylink.h | 2 +- include/link/patch.h | 2 +- include/link/symbol.h | 2 +- include/{link => }/types.h | 4 ++-- src/asm/fstack.c | 2 +- src/asm/lexer.c | 2 +- src/asm/math.c | 2 +- src/asm/rpn.c | 2 +- src/link/library.c | 2 +- src/link/symbol.c | 2 +- 19 files changed, 19 insertions(+), 34 deletions(-) delete mode 100644 include/asm/types.h rename include/{link => }/types.h (82%) diff --git a/include/asm/asm.h b/include/asm/asm.h index b7f5a13a..1f70f6f7 100644 --- a/include/asm/asm.h +++ b/include/asm/asm.h @@ -13,7 +13,7 @@ #include #include -#include "asm/types.h" +#include "types.h" #include "asm/symbol.h" #include "asm/localasm.h" diff --git a/include/asm/fstack.h b/include/asm/fstack.h index 8df66b82..c77dda4c 100644 --- a/include/asm/fstack.h +++ b/include/asm/fstack.h @@ -12,7 +12,7 @@ #include #include "asm/asm.h" -#include "asm/types.h" +#include "types.h" #include "asm/lexer.h" struct sContext { diff --git a/include/asm/lexer.h b/include/asm/lexer.h index ba8b6506..3caea4c6 100644 --- a/include/asm/lexer.h +++ b/include/asm/lexer.h @@ -3,7 +3,7 @@ #include -#include "asm/types.h" +#include "types.h" #define LEXHASHSIZE (1 << 11) #define MAXSTRLEN 255 diff --git a/include/asm/mymath.h b/include/asm/mymath.h index f5cc873c..69a83838 100644 --- a/include/asm/mymath.h +++ b/include/asm/mymath.h @@ -1,7 +1,7 @@ #ifndef RGBDS_ASM_MATH_H #define RGBDS_ASM_MATH_H -#include "asm/types.h" +#include "types.h" void math_DefinePI(void); void math_Print(SLONG i); diff --git a/include/asm/output.h b/include/asm/output.h index db974ec6..2afbccc5 100644 --- a/include/asm/output.h +++ b/include/asm/output.h @@ -2,7 +2,7 @@ #define RGBDS_ASM_OUTPUT_H #include "asm/rpn.h" -#include "asm/types.h" +#include "types.h" struct Section { char *pzName; diff --git a/include/asm/symbol.h b/include/asm/symbol.h index 3ffa0531..1b8ceaff 100644 --- a/include/asm/symbol.h +++ b/include/asm/symbol.h @@ -1,7 +1,7 @@ #ifndef RGBDS_SYMBOL_H #define RGBDS_SYMBOL_H -#include "asm/types.h" +#include "types.h" #define HASHSIZE (1 << 16) #define MAXSYMLEN 256 diff --git a/include/asm/types.h b/include/asm/types.h deleted file mode 100644 index 1fb9bcd1..00000000 --- a/include/asm/types.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef RGBDS_ASM_TYPES_H -#define RGBDS_ASM_TYPES_H - -#ifndef _MAX_PATH -#define _MAX_PATH 512 -#endif - -typedef unsigned char UBYTE; -typedef signed char SBYTE; -typedef unsigned short UWORD; -typedef signed short SWORD; -typedef unsigned long ULONG; -typedef signed long SLONG; - -#endif diff --git a/include/link/assign.h b/include/link/assign.h index d00ce3e7..5b6cd2a9 100644 --- a/include/link/assign.h +++ b/include/link/assign.h @@ -1,7 +1,7 @@ #ifndef RGBDS_LINK_ASSIGN_H #define RGBDS_LINK_ASSIGN_H -#include "link/types.h" +#include "types.h" enum eBankDefine { BANK_ROM0 = 0, diff --git a/include/link/main.h b/include/link/main.h index c7270ebd..3915f49b 100644 --- a/include/link/main.h +++ b/include/link/main.h @@ -1,7 +1,7 @@ #ifndef RGBDS_LINK_MAIN_H #define RGBDS_LINK_MAIN_H -#include "link/types.h" +#include "types.h" extern SLONG fillchar; extern char smartlinkstartsymbol[256]; diff --git a/include/link/mylink.h b/include/link/mylink.h index 75455edb..707d5fbf 100644 --- a/include/link/mylink.h +++ b/include/link/mylink.h @@ -5,7 +5,7 @@ #define _MAX_PATH 512 #endif -#include "link/types.h" +#include "types.h" extern SLONG options; #define OPT_SMALL 0x01 diff --git a/include/link/patch.h b/include/link/patch.h index 07645f1c..14fca34a 100644 --- a/include/link/patch.h +++ b/include/link/patch.h @@ -1,7 +1,7 @@ #ifndef RGBDS_LINK_PATCH_H #define RGBDS_LINK_PATCH_H -#include "link/types.h" +#include "types.h" void Patch(void); extern SLONG nPC; diff --git a/include/link/symbol.h b/include/link/symbol.h index f64548c3..3be6e43c 100644 --- a/include/link/symbol.h +++ b/include/link/symbol.h @@ -1,7 +1,7 @@ #ifndef RGBDS_LINK_SYMBOL_H #define RGBDS_LINK_SYMBOL_H -#include "link/types.h" +#include "types.h" void sym_Init(void); void sym_CreateSymbol(char *tzName, SLONG nValue, SBYTE nBank); diff --git a/include/link/types.h b/include/types.h similarity index 82% rename from include/link/types.h rename to include/types.h index ebf574e7..902408ca 100644 --- a/include/link/types.h +++ b/include/types.h @@ -1,5 +1,5 @@ -#ifndef RGBDS_LINK_TYPES_H -#define RGBDS_LINK_TYPES_H +#ifndef RGBDS_TYPES_H +#define RGBDS_TYPES_H #ifndef _MAX_PATH #define _MAX_PATH 512 diff --git a/src/asm/fstack.c b/src/asm/fstack.c index 6b38d8c7..56fc46d0 100644 --- a/src/asm/fstack.c +++ b/src/asm/fstack.c @@ -10,7 +10,7 @@ #include "asm/symbol.h" #include "asm/fstack.h" -#include "asm/types.h" +#include "types.h" #include "asm/main.h" #include "asm/lexer.h" #include "extern/err.h" diff --git a/src/asm/lexer.c b/src/asm/lexer.c index d212ef12..4b2548f4 100644 --- a/src/asm/lexer.c +++ b/src/asm/lexer.c @@ -6,7 +6,7 @@ #include "asm/asm.h" #include "asm/lexer.h" -#include "asm/types.h" +#include "types.h" #include "asm/main.h" #include "asm/rpn.h" #include "asm/fstack.h" diff --git a/src/asm/math.c b/src/asm/math.c index 7ddfb18e..5649e628 100644 --- a/src/asm/math.c +++ b/src/asm/math.c @@ -5,7 +5,7 @@ #include #include -#include "asm/types.h" +#include "types.h" #include "asm/mymath.h" #include "asm/symbol.h" diff --git a/src/asm/rpn.c b/src/asm/rpn.c index f3d140e0..3a8dba27 100644 --- a/src/asm/rpn.c +++ b/src/asm/rpn.c @@ -6,7 +6,7 @@ #include #include "asm/mylink.h" -#include "asm/types.h" +#include "types.h" #include "asm/symbol.h" #include "asm/asm.h" #include "asm/main.h" diff --git a/src/link/library.c b/src/link/library.c index e49d7671..1f29fce8 100644 --- a/src/link/library.c +++ b/src/link/library.c @@ -3,7 +3,7 @@ #include #include "extern/err.h" -#include "link/types.h" +#include "types.h" #include "link/mylink.h" #include "link/main.h" diff --git a/src/link/symbol.c b/src/link/symbol.c index 6f5cc9cc..b0040022 100644 --- a/src/link/symbol.c +++ b/src/link/symbol.c @@ -5,7 +5,7 @@ #include "extern/err.h" #include "link/main.h" #include "link/patch.h" -#include "link/types.h" +#include "types.h" #define HASHSIZE 73