projects
/
fw
/
sdcc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* doc/sdccman.lyx: new pragma NOIV by Johannes Stezenbach <js@convergence.de>
[fw/sdcc]
/
src
/
common.h
diff --git
a/src/common.h
b/src/common.h
index ced0a15a2ebb5caadb8bc707f568cb2a1b1e49ce..0909e7dce993176f972803d55171ff61b45878e1 100644
(file)
--- a/
src/common.h
+++ b/
src/common.h
@@
-4,9
+4,15
@@
#include <string.h>
#include <assert.h>
#include <string.h>
#include <assert.h>
+#if defined(__APPLE__) && (__MACH__)
+#ifdef _G
+#undef _G
+#endif
+#endif
+
#include "SDCCglobl.h"
#include "SDCCglobl.h"
-#include "SDCCast.h"
#include "SDCCmem.h"
#include "SDCCmem.h"
+#include "SDCCast.h"
#include "SDCCy.h"
#include "SDCChasht.h"
#include "SDCCbitv.h"
#include "SDCCy.h"
#include "SDCChasht.h"
#include "SDCCbitv.h"
@@
-21,11
+27,10
@@
#include "SDCClrange.h"
#include "SDCCptropt.h"
#include "SDCCopt.h"
#include "SDCClrange.h"
#include "SDCCptropt.h"
#include "SDCCopt.h"
+#include "SDCCglue.h"
+#include "SDCCpeeph.h"
#include "asm.h"
#include "port.h"
#include "asm.h"
#include "port.h"
-#include "config.h"
-/*
-#include "SDCCralloc.h"
-*/
+#include "newalloc.h"