X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcommon.h;h=d1a5b21fdbe97aacd770fea3da1e6cc6102d4a99;hb=80972b2e54c9b88f11c27b878874fd2a6a681391;hp=30872eae1dcbd1922ca795c874faea1e9635908b;hpb=9cfb06226bf95c1b0d76c2c99c263809f3bfc19d;p=fw%2Fsdcc

diff --git a/src/common.h b/src/common.h
index 30872eae..d1a5b21f 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"
@@ -20,10 +31,14 @@
 #include "SDCClrange.h"
 #include "SDCCptropt.h"
 #include "SDCCopt.h"
+#include "SDCCglue.h"
+#include "SDCCpeeph.h"
+#include "SDCCdebug.h"
+#include "SDCCutil.h"
+#include "SDCCasm.h"
 
 #include "port.h"
-#include "config.h"
 
-/*
-#include "SDCCralloc.h"
-*/
+#include "newalloc.h"
+
+#endif