* src/z80/peep.c: fixed msvc warning C4047:

  'return' : 'int ' differs in levels of indirection from 'char *'
* config.dsp: as/lib corrected to as/link

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

diff --git a/ChangeLog b/ChangeLog
index c33480a8d7869483f35af68d0eba23aef6238031..5be4c1f1b40ff79d4d0f899b2525ba268e4d83fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
        * doc/README.txt: updated John Hartman's e-mail address
        * as/link/lkrel.c, as/link/lksdcclib.c:
          fixed bug #2484677: Linker hangs
+       * src/z80/peep.c: fixed msvc warning C4047:
+         'return' : 'int ' differs in levels of indirection from 'char *'
+       * config.dsp: as/lib corrected to as/link
 
 2009-01-04 Philipp Klaus Krause <pkk AT spth.de>
 

diff --git a/config.dsp b/config.dsp
index 68142ae48ef562de4bbb6197d4c60f5dbcd9e282..2d30ad439878f6757472fd0fe010ff3124129740 100644 (file)
--- a/config.dsp
+++ b/config.dsp
@@ -68,7 +68,7 @@ SOURCE=.\as\link\asxxxx_config.h.in
 # Begin Custom Build\r
 InputPath=.\as\link\asxxxx_config.h.in\r
 \r
-"as/lib/asxxxx_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"as/link/asxxxx_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
        gawk -f configure_vc.awk as/link/asxxxx_config.h.in > as/link/asxxxx_config.h\r
 \r
 # End Custom Build\r
@@ -78,7 +78,7 @@ InputPath=.\as\link\asxxxx_config.h.in
 # Begin Custom Build\r
 InputPath=.\as\link\asxxxx_config.h.in\r
 \r
-"as/lib/asxxxx_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+"as/link/asxxxx_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
        gawk -f configure_vc.awk as/link/asxxxx_config.h.in > as/link/asxxxx_config.h\r
 \r
 # End Custom Build\r

diff --git a/src/z80/peep.c b/src/z80/peep.c
index affdf1905d45346794e8435d9a52cde803b0587a..b30335c21a1eba8c7a45339514c5a0e96fc17af0 100644 (file)
--- a/src/z80/peep.c
+++ b/src/z80/peep.c
@@ -195,9 +195,7 @@ findLabel (const lineNode *pl)
 /* Check if reading arg implies reading what. */
 static bool argCont(const char *arg, const char *what)
 {
-       if(arg[0] == '#')
-               return FALSE;
-       return(strstr(arg, what));;
+  return (arg[0] == '#') ? FALSE : strstr(arg, what) != NULL;
 }
 
 static bool
@@ -262,7 +260,7 @@ z80MightRead(const lineNode *pl, const char *what)
     strncmp(pl->line, "dec\t", 4) == 0 ||
     strncmp(pl->line, "inc\t", 4) == 0 ||
     strncmp(pl->line, "rl\t", 4) == 0 ||
-    strncmp(pl->line, "rr\t", 4) == 0 ||  
+    strncmp(pl->line, "rr\t", 4) == 0 ||
     strncmp(pl->line, "sla\t", 4) == 0 ||
     strncmp(pl->line, "sra\t", 4) == 0 ||
     strncmp(pl->line, "srl\t", 4) == 0)