shithub: rgbds

Info  •  Files  •  Log  •  Branches

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

--- a/include/asm/asm.h

+++ b/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"

--- a/include/asm/fstack.h

+++ b/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 {

--- a/include/asm/lexer.h

+++ b/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

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

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

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

--- a/include/asm/types.h

+++ /dev/null

@@ -1,15 +1,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

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

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

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

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

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

--- a/include/link/types.h

+++ /dev/null

@@ -1,16 +1,0 @@

-#ifndef RGBDS_LINK_TYPES_H

-#define RGBDS_LINK_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;

-typedef signed char BBOOL;

-

-#endif

--- /dev/null

+++ b/include/types.h

@@ -1,0 +1,16 @@

+#ifndef RGBDS_TYPES_H

+#define RGBDS_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;

+typedef signed char BBOOL;

+

+#endif

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

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

--- a/src/asm/math.c

+++ b/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"

--- a/src/asm/rpn.c

+++ b/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"

--- a/src/link/library.c

+++ b/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"

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