X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcommon.h;h=b39f380f1bde40cab5ee81285624050e461ab505;hb=2250697a6222ccdcc9f6a16af424cebc08df43f9;hp=2e6f031942a46a08294961bc71cac90dbb99bb34;hpb=958a651d053c089412d87ab75101812383d03f19;p=fw%2Fsdcc

diff --git a/src/common.h b/src/common.h
index 2e6f0319..b39f380f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,11 +1,22 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 #include <assert.h>
 
+
+#ifndef COMMON_H
+#define COMMON_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"
@@ -18,9 +29,16 @@
 #include "SDCCcflow.h"
 #include "SDCCdflow.h"
 #include "SDCClrange.h"
-#include "SDCCralloc.h"
 #include "SDCCptropt.h"
 #include "SDCCopt.h"
+#include "SDCCglue.h"
+#include "SDCCpeeph.h"
+#include "SDCCdebug.h"
+#include "SDCCutil.h"
 
+#include "asm.h"
 #include "port.h"
-#include "config.h"
+
+#include "newalloc.h"
+
+#endif