* src/ds390/gen.c: fix deps by replacing <common.h> with "common.h"

* src/SDCC.lex: rename P_OVERLAY to P_OVERLAY_ for cross-gcc 3.2 MINGW32

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2186 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index fc11a24fdd39059991b338eb98377ec6344dc029..ba913355a281154b27312e82251767f41b61ad42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-28  Bernhard Held <bernhard@bernhardheld.de>
+
+       * src/ds390/gen.c: fix deps by replacing <common.h> with "common.h"
+       * src/SDCC.lex: rename P_OVERLAY to P_OVERLAY_ for cross-gcc 3.2 MINGW32 
+
 2003-01-26    <johan@balder>
 
        * src/SDCClrange.c:  fixed Bernhard's "char * code ptr = &c"
@@ -7,7 +12,7 @@
 
 2003-01-26  Bernhard Held <bernhard@bernhardheld.de>
 
-       * as/mcs51/strcmpi.c: added, provides as_strcmpi(); strcmpi() is not ANSI
+       * as/mcs51/strcmpi.c: added, provides Aurelien Jarno's as_strcmpi(); strcmpi() is not ANSI
        * as/mcs51/strcmpi.h: added
        * as/mcs51/asm.h: remove ugly "#define strcmpi strcmp"
        * as/mcs51/aslink.h: remove ugly "#define strcmpi strcmp"

diff --git a/src/SDCC.lex b/src/SDCC.lex
index b67cda3da8f7c1fd7747e2eb381e20574cea6955..a7ba72a729a170eb8f0c89a3bc2b2db134bb6685 100644 (file)
--- a/src/SDCC.lex
+++ b/src/SDCC.lex
@@ -77,7 +77,8 @@ struct options  save_options  ;
      P_CALLEE_SAVES,
      P_EXCLUDE   ,
      P_LOOPREV   ,
-     P_OVERLAY
+     P_OVERLAY_             /* I had a strange conflict with P_OVERLAY while */
+                    /* cross-compiling for MINGW32 with gcc 3.2 */
  };
 
 %}
@@ -460,7 +461,7 @@ void doPragma (int op, char *cp)
     case P_LOOPREV:
        optimize.noLoopReverse = 1;
        break;
-    case P_OVERLAY:
+    case P_OVERLAY_:
        break; /* notyet */
     }
 }

diff --git a/src/ds390/gen.c b/src/ds390/gen.c
index e7bcfcd1010d4723d34603c63c55c168f0efefb8..cae207b7e36698a6079f1080c0b60312346a43bc 100644 (file)
--- a/src/ds390/gen.c
+++ b/src/ds390/gen.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <common.h>
+#include "common.h"
 #include "ralloc.h"
 #include "gen.h"
 #include "SDCCglobl.h"