Hacked const and volatile modifiers a bit.

[fw/sdcc] / src / common.h

diff --git a/src/common.h b/src/common.h
index 3d257086a8b89faa8c1dc4560ed32ea16370fb0c..8a8ad4fe1c418cfd21b79bad174ec9edff8121f5 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -4,9 +4,15 @@
 #include <string.h>
 #include <assert.h>
 
+#if defined(__APPLE__) && (__MACH__)
+#ifdef _G
+#undef _G
+#endif
+#endif
+
 #include "SDCCglobl.h"
-#include "SDCCast.h"
 #include "SDCCmem.h"
+#include "SDCCast.h"
 #include "SDCCy.h"
 #include "SDCChasht.h"
 #include "SDCCbitv.h"
@@ -23,6 +29,9 @@
 #include "SDCCopt.h"
 #include "SDCCglue.h"
 #include "SDCCpeeph.h"
+#include "SDCCutil.h"
 
 #include "asm.h"
 #include "port.h"
+
+#include "newalloc.h"