Merge include/link/types.h and include/asm/types.h into include/types.h

include/asm/asm.h

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "asm/types.h"
+#include "types.h"
 #include "asm/symbol.h"
 
 #include "asm/localasm.h"

include/asm/fstack.h

@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #include "asm/asm.h"
-#include "asm/types.h"
+#include "types.h"
 #include "asm/lexer.h"
 
 struct sContext {

include/asm/lexer.h

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 
-#include "asm/types.h"
+#include "types.h"
 
 #define LEXHASHSIZE (1 << 11)
 #define MAXSTRLEN 255

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);

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;

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

include/asm/types.h

@@ -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

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,

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];

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

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;

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);

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

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"

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"

src/asm/math.c

@@ -5,7 +5,7 @@
 #include <math.h>
 #include <stdio.h>
 
-#include "asm/types.h"
+#include "types.h"
 #include "asm/mymath.h"
 #include "asm/symbol.h"
 

src/asm/rpn.c

@@ -6,7 +6,7 @@
 #include <string.h>
 
 #include "asm/mylink.h"
-#include "asm/types.h"
+#include "types.h"
 #include "asm/symbol.h"
 #include "asm/asm.h"
 #include "asm/main.h"

src/link/library.c

@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include "extern/err.h"
-#include "link/types.h"
+#include "types.h"
 #include "link/mylink.h"
 #include "link/main.h"
 

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