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

This commit is contained in:
stag019
2015-03-07 16:04:07 -05:00
parent e195076793
commit ebc9a4b786
19 changed files with 19 additions and 34 deletions

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
#ifndef RGBDS_ASM_MATH_H #ifndef RGBDS_ASM_MATH_H
#define RGBDS_ASM_MATH_H #define RGBDS_ASM_MATH_H
#include "asm/types.h" #include "types.h"
void math_DefinePI(void); void math_DefinePI(void);
void math_Print(SLONG i); void math_Print(SLONG i);

View File

@@ -2,7 +2,7 @@
#define RGBDS_ASM_OUTPUT_H #define RGBDS_ASM_OUTPUT_H
#include "asm/rpn.h" #include "asm/rpn.h"
#include "asm/types.h" #include "types.h"
struct Section { struct Section {
char *pzName; char *pzName;

View File

@@ -1,7 +1,7 @@
#ifndef RGBDS_SYMBOL_H #ifndef RGBDS_SYMBOL_H
#define RGBDS_SYMBOL_H #define RGBDS_SYMBOL_H
#include "asm/types.h" #include "types.h"
#define HASHSIZE (1 << 16) #define HASHSIZE (1 << 16)
#define MAXSYMLEN 256 #define MAXSYMLEN 256

View File

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

View File

@@ -1,7 +1,7 @@
#ifndef RGBDS_LINK_ASSIGN_H #ifndef RGBDS_LINK_ASSIGN_H
#define RGBDS_LINK_ASSIGN_H #define RGBDS_LINK_ASSIGN_H
#include "link/types.h" #include "types.h"
enum eBankDefine { enum eBankDefine {
BANK_ROM0 = 0, BANK_ROM0 = 0,

View File

@@ -1,7 +1,7 @@
#ifndef RGBDS_LINK_MAIN_H #ifndef RGBDS_LINK_MAIN_H
#define RGBDS_LINK_MAIN_H #define RGBDS_LINK_MAIN_H
#include "link/types.h" #include "types.h"
extern SLONG fillchar; extern SLONG fillchar;
extern char smartlinkstartsymbol[256]; extern char smartlinkstartsymbol[256];

View File

@@ -5,7 +5,7 @@
#define _MAX_PATH 512 #define _MAX_PATH 512
#endif #endif
#include "link/types.h" #include "types.h"
extern SLONG options; extern SLONG options;
#define OPT_SMALL 0x01 #define OPT_SMALL 0x01

View File

@@ -1,7 +1,7 @@
#ifndef RGBDS_LINK_PATCH_H #ifndef RGBDS_LINK_PATCH_H
#define RGBDS_LINK_PATCH_H #define RGBDS_LINK_PATCH_H
#include "link/types.h" #include "types.h"
void Patch(void); void Patch(void);
extern SLONG nPC; extern SLONG nPC;

View File

@@ -1,7 +1,7 @@
#ifndef RGBDS_LINK_SYMBOL_H #ifndef RGBDS_LINK_SYMBOL_H
#define RGBDS_LINK_SYMBOL_H #define RGBDS_LINK_SYMBOL_H
#include "link/types.h" #include "types.h"
void sym_Init(void); void sym_Init(void);
void sym_CreateSymbol(char *tzName, SLONG nValue, SBYTE nBank); void sym_CreateSymbol(char *tzName, SLONG nValue, SBYTE nBank);

View File

@@ -1,5 +1,5 @@
#ifndef RGBDS_LINK_TYPES_H #ifndef RGBDS_TYPES_H
#define RGBDS_LINK_TYPES_H #define RGBDS_TYPES_H
#ifndef _MAX_PATH #ifndef _MAX_PATH
#define _MAX_PATH 512 #define _MAX_PATH 512

View File

@@ -10,7 +10,7 @@
#include "asm/symbol.h" #include "asm/symbol.h"
#include "asm/fstack.h" #include "asm/fstack.h"
#include "asm/types.h" #include "types.h"
#include "asm/main.h" #include "asm/main.h"
#include "asm/lexer.h" #include "asm/lexer.h"
#include "extern/err.h" #include "extern/err.h"

View File

@@ -6,7 +6,7 @@
#include "asm/asm.h" #include "asm/asm.h"
#include "asm/lexer.h" #include "asm/lexer.h"
#include "asm/types.h" #include "types.h"
#include "asm/main.h" #include "asm/main.h"
#include "asm/rpn.h" #include "asm/rpn.h"
#include "asm/fstack.h" #include "asm/fstack.h"

View File

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

View File

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

View File

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

View File

@@ -5,7 +5,7 @@
#include "extern/err.h" #include "extern/err.h"
#include "link/main.h" #include "link/main.h"
#include "link/patch.h" #include "link/patch.h"
#include "link/types.h" #include "types.h"
#define HASHSIZE 73 #define HASHSIZE 73