* device/include/string.h: applied Stas Sergeev's patch to make this

header file compatible with the preprocessor -Wundef option
* src/SDCCmain.c (main): abort compilation if preprocessor reports
failure (fixes bug #941458)

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

diff --git a/ChangeLog b/ChangeLog
index a48e4aea68f726faf41e4a0a652007bc167c48f1..80e06d2cef92f709499c6c7c346fa8295b13ead2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-22 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+       * device/include/string.h: applied Stas Sergeev's patch to make this
+       header file compatible with the preprocessor -Wundef option
+       * src/SDCCmain.c (main): abort compilation if preprocessor reports
+       failure (fixes bug #941458)
+
 2004-05-21 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
 
        * src/SDCCopt.c (killDeadCode): fixed bug #907733

diff --git a/device/include/string.h b/device/include/string.h
index 2800db732f20b22a5e5966386f070d54980686e6..aabc9037fde213c8984f4d76993bd14babc37d01 100644 (file)
--- a/device/include/string.h
+++ b/device/include/string.h
@@ -54,7 +54,7 @@ extern int   memcmp (void *, void *, size_t )  ;
 extern void *memset (void *, unsigned char  , size_t )  ;
 extern void *memmove (void *, void *, size_t )  ;
 
-#if SDCC_ds390
+#ifdef SDCC_ds390
 extern void xdata * memcpyx(void xdata *, void xdata *, int) _naked;
 #endif
 

diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index 92e084521b693b4b46525b261cad0a722107108e..9b720b27f667e2da84a5518f082cb7a1a875b839 100644 (file)
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -2156,7 +2156,8 @@ main (int argc, char **argv, char **envp)
 
       yyparse ();
 
-      pclose(yyin);
+      if (pclose(yyin))
+        fatalError = 1;
       deleteSetItem(&pipeSet, yyin);
 
       if (fatalError) {