General removal of compiler warnings

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

diff --git a/as/as_z80.dsp b/as/as_z80.dsp
index 71f3cc4f24c1025c9603d6898b1aee5e981534b7..3931caa21c3711b8ed6c4b3d7f06ff250a8bd388 100644 (file)
--- a/as/as_z80.dsp
+++ b/as/as_z80.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G3 /Zp8 /ML /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /J /FD /GZ /c
+# ADD CPP /nologo /G3 /ML /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /J /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -138,6 +138,22 @@ SOURCE=.\z80\z80pst.c
 # Begin Group "Header Files"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\z80\alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80\asm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80\string.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80\z80.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 

diff --git a/as/aslink.dsp b/as/aslink.dsp
index a9e52e8ba31ac88f85c63c25c4e01b306f9f6f28..bdabc6b58ca36e3e6ed44ad3981ae36a1e45c5de 100644 (file)
--- a/as/aslink.dsp
+++ b/as/aslink.dsp
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G3 /Zp8 /ML /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /J /FD /GZ /c
+# ADD CPP /nologo /G3 /ML /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /J /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -75,8 +75,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\bin\aslink.exe" /pdbtype:sept
-# SUBTRACT LINK32 /nodefaultlib
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\aslink.exe" /pdbtype:sept
+# SUBTRACT LINK32 /incremental:no /nodefaultlib
 
 !ENDIF 
 
@@ -147,6 +147,26 @@ SOURCE=mcs51\lksym.c
 # Begin Group "Header Files"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\mcs51\alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mcs51\aslink.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mcs51\asm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mcs51\i8051.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mcs51\string.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 

diff --git a/as/asx8051.dsp b/as/asx8051.dsp
index 19808e898da4e00b257bdf71f919cd3d81020630..c2e3e19bf4758b1e4ba64ef7b113d45b3ec680ec 100644 (file)
--- a/as/asx8051.dsp
+++ b/as/asx8051.dsp
@@ -75,7 +75,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"\sdcc\bin\asx8051.exe" /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"\sdcc\bin\asx8051.exe" /pdbtype:sept
+# SUBTRACT LINK32 /incremental:no
 
 !ENDIF 
 

diff --git a/packihx/PackIhx.dsp b/packihx/PackIhx.dsp
index fbf47893160fb3c351dffe09a1af8152f51cfea9..abb5f0d0300e3cce0d1b705211fcfa7f0f82b42c 100644 (file)
--- a/packihx/PackIhx.dsp
+++ b/packihx/PackIhx.dsp
@@ -62,12 +62,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "mcs51"
-# PROP Intermediate_Dir "mcs51"
+# PROP Output_Dir ""
+# PROP Intermediate_Dir ""
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G3 /Zp8 /ML /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /J /FD /GZ /c
+# ADD CPP /nologo /G3 /ML /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /J /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -75,7 +75,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"\sdcc\bin\packihx.exe" /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"\sdcc\bin\packihx.exe" /pdbtype:sept
+# SUBTRACT LINK32 /incremental:no
 
 !ENDIF 
 

diff --git a/sdcc_vc.h b/sdcc_vc.h
index ca2e5156037f966c323b6e4b86214cc7214706ef..afd0f2947caf50134f2cfd7bbad5ac24640aded2 100644 (file)
--- a/sdcc_vc.h
+++ b/sdcc_vc.h
@@ -9,6 +9,10 @@
 #define SDCC_VERSION_P 1
 #define SDCC_VERSION_STR "2.2.2"
 
+/* MSVC 6 does not have __FUNCTION__ preprocessor macro defined */
+
+#define __FUNCTION__ __FILE__
+
 #undef PREFIX
 #undef DATADIR
 #undef SRCDIR

diff --git a/src/mcs51/mcs51.dsp b/src/mcs51/mcs51.dsp
index 0f5899b4378a4ef0009a0078abc425457dbcb7fa..4b802659e7e1c68d572c825ecd5966e33239ff03 100644 (file)
--- a/src/mcs51/mcs51.dsp
+++ b/src/mcs51/mcs51.dsp
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ""
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /G3 /Zp8 /ML /W3 /Gm /GX /ZI /Od /I ".." /I "." /I "..\.." /I "..\..\support\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /J /FD /Zm500 /GZ /c
+# ADD CPP /nologo /G3 /ML /W3 /Gm /GX /ZI /Od /I ".." /I "." /I "..\.." /I "..\..\support\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /J /FD /Zm500 /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -91,24 +91,34 @@ SOURCE=.\gen.c
 # Begin Source File
 
 SOURCE=.\main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\peeph.def
 
 !IF  "$(CFG)" == "mcs51 - Win32 Release"
 
+!ELSEIF  "$(CFG)" == "mcs51 - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__MAIN_="peeph.rul"     
 # Begin Custom Build
-InputPath=.\peeph.def
+TargetName=port
+InputPath=.\main.c
+
+"$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       cl /nologo /G3 /ML /W3 /Gm /GX /ZI /Od /I ".." /I "." /I "..\.." /I "..\..\support\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /J /FD /Zm500 /GZ /c $(InputPath)
 
-"peeph.rul" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       echo on 
-       gawk -f ../SDCCpeeph.awk $(InputPath) >peeph.rul 
-       
 # End Custom Build
 
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\peeph.def
+
+!IF  "$(CFG)" == "mcs51 - Win32 Release"
+
 !ELSEIF  "$(CFG)" == "mcs51 - Win32 Debug"
 
+# PROP Ignore_Default_Tool 1
 # Begin Custom Build
 InputPath=.\peeph.def
 
@@ -139,8 +149,23 @@ SOURCE=.\main.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\peeph.rul
+
+!IF  "$(CFG)" == "mcs51 - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mcs51 - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\ralloc.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\sdcc_vc.h
+# End Source File
 # End Group
 # End Target
 # End Project

diff --git a/src/pic/pic.dsp b/src/pic/pic.dsp
index 80bf2d34aefee5f2794c6de3e02ff54c9ab278ab..0ff4008fef089c3eab4dc3b1115bf9e5d9338151 100644 (file)
--- a/src/pic/pic.dsp
+++ b/src/pic/pic.dsp
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ""
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /G3 /Zp8 /ML /W3 /Gm /GX /ZI /Od /I ".." /I "." /I "..\.." /I "..\..\support\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /J /FD /Zm500 /GZ /c
+# ADD CPP /nologo /G3 /ML /W3 /Gm /GX /ZI /Od /I ".." /I "." /I "..\.." /I "..\..\support\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /J /FD /Zm500 /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -90,6 +90,10 @@ SOURCE=.\gen.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\genarith.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\glue.c
 # End Source File
 # Begin Source File
@@ -98,6 +102,14 @@ SOURCE=.\main.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\pcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcodepeep.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\peeph.def
 
 !IF  "$(CFG)" == "pic - Win32 Release"
@@ -147,6 +159,10 @@ SOURCE=.\main.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\pcode.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\ralloc.h
 # End Source File
 # End Group

diff --git a/src/src.dsp b/src/src.dsp
index 513451c4ee8e81b749eb5ff33eddcba919e3cde1..da57897e97d24edfa1d06d67ae0ecd7c99c26d00 100644 (file)
--- a/src/src.dsp
+++ b/src/src.dsp
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G3 /Zp8 /ML /W3 /Gm /GX /ZI /Od /I ".." /I "..\support\util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /J /FD /GZ /c
+# ADD CPP /nologo /G3 /ML /W3 /Gm /GX /ZI /Od /I ".." /I "..\support\util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /J /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -250,28 +250,289 @@ SOURCE=.\sdccy.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE=.\asm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\common.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\support\Util\newalloc.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\port.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\sdcc_vc.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\SDCCast.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\SDCCBBlock.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\SDCCbitv.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCcflow.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCcse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCdflow.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\SDCCglobl.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\SDCCglue.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCChasht.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCicode.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCClabel.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCloop.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCClrange.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCmem.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCopt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCpeeph.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCptropt.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\SDCCset.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\SDCCsymt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SDCCval.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sdccy.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\spawn.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # End Group
+# Begin Group "Regression Test"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\regression\add.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\arrays.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\b.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\bool1.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\call1.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\compare.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\compare2.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\for.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\pointer1.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\struct1.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\sub.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\TempTest.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\regression\while.c
+
+!IF  "$(CFG)" == "src - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "src - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# End Group
 # End Target
 # End Project

diff --git a/support/cpp/cppexp.c b/support/cpp/cppexp.c
index 9dc3b874625b4ccbfcfae2470f87e9787629687f..36f70c7c12e7d76d2c5f49d47f6fd0c35fcd88e5 100644 (file)
--- a/support/cpp/cppexp.c
+++ b/support/cpp/cppexp.c
@@ -24,10 +24,6 @@ Written by Per Bothner 1994. */
 
 /* Parse a C expression from text in a string  */
 
-//#if defined(_MSC_VER)
-//#include <malloc.h>
-//#endif
-
 #include "config.h"   
 #include "cpplib.h"
 
@@ -230,7 +226,7 @@ parse_number (
     if (largest_digit < digit)
       largest_digit = digit;
     nd = n * base + digit;
-    overflow |= ULONG_MAX_over_base < n | nd < n;
+    overflow |= ((ULONG_MAX_over_base < n) | (nd < n)) ;
     n = nd;
   }
 
@@ -286,7 +282,7 @@ cpp_lex (
 cpp_reader *pfile)
 {
   register int c;
-  register int namelen;
+/*  register int namelen; */
   register struct token *toktab;
   enum cpp_token token;
   struct operation op;
@@ -371,7 +367,7 @@ cpp_reader *pfile)
              {
                c = cpp_parse_escape (pfile, &ptr);
                if (width < HOST_BITS_PER_INT
-                 && (unsigned) c >= (1 << width))
+                 && (unsigned) c >= (1U << width))
                    cpp_pedwarn (pfile,
                                 "escape sequence out of range for character");
              }

diff --git a/support/cpp/sdcpp.dsp b/support/cpp/sdcpp.dsp
index 1cb018803ec504773a6ac6c43d9fd04dcf41643a..77ae9597c403ff9219a91c1223e418e02f3c53bc 100644 (file)
--- a/support/cpp/sdcpp.dsp
+++ b/support/cpp/sdcpp.dsp
@@ -68,12 +68,13 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G3 /Zp8 /ML /W3 /Gm /GX /ZI /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"./" /J /FD /GZ /c
+# ADD CPP /nologo /G3 /ML /W3 /Gm /GX /ZI /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"./" /J /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /o".\sdcpp.bsc"
+# ADD BSC32 /o".\sdcpp.bsc"
+# SUBTRACT BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 /nologo /version:2.2 /subsystem:console /debug /machine:I386 /out:"..\..\bin\sdcpp.exe" /pdbtype:sept
@@ -145,5 +146,22 @@ SOURCE=.\tm.h
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # End Group
+# Begin Group "Test"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\cppTest\cpptest.c
+
+!IF  "$(CFG)" == "sdcpp - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "sdcpp - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# End Group
 # End Target
 # End Project