* as/link/asxxxx_config.h.in:

  fixed warning: extra tokens at end of #endif directive
* src/z80/peep.c:
  fixed warning: suggest parentheses around && within ||

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

diff --git a/ChangeLog b/ChangeLog
index 8c8c6776e0e61a3eb5e6a42035c793b1f5aa5ecc..dd28e2670edd703f4933cc1cdcab136fcfd72e49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2009-01-01 Borut Razem <borut.razem AT siol.net>
+
+       * as/link/asxxxx_config.h.in:
+         fixed warning: extra tokens at end of #endif directive
+       * src/z80/peep.c:
+         fixed warning: suggest parentheses around && within ||
+
 2008-12-31 Borut Razem <borut.razem AT siol.net>
 
        * configure, configure.in, config.dsp, config_vc.awk,
-         as\link\asxxxx_config.h.in, as\link\hc08\lkelf.c, as\link\aslink.h:
+         as/link/asxxxx_config.h.in, as/link/hc08/lkelf.c, as/link/aslink.h,
+         as/link/hc08/Makefile.in, as/link/mcs51/Makefile.in:
          introduced asxxxx_config.h.in
 
 2008-12-30 Philipp Klaus Krause <pkk AT spth.de>

diff --git a/as/link/asxxxx_config.h.in b/as/link/asxxxx_config.h.in
index ebd9ee482a9ca10fc7b6b518b3dd7dda8a75b166..7d2128ed43a62acc730e3a75fadcee06f44c2227 100644 (file)
--- a/as/link/asxxxx_config.h.in
+++ b/as/link/asxxxx_config.h.in
@@ -43,4 +43,4 @@
 # define TYPE_UDWORD unsigned TYPE_DWORD
 #endif
 
-#endif __ASXXXX_CONFIG_H
+#endif  /* __ASXXXX_CONFIG_H */

diff --git a/src/z80/peep.c b/src/z80/peep.c
index ff72544bd6bf1d337f7ac256e693173a790ac2d3..43781745ab9c2a55527be2efac4e5fd14297963a 100644 (file)
--- a/src/z80/peep.c
+++ b/src/z80/peep.c
@@ -280,8 +280,8 @@ z80UncondJump(const lineNode *pl)
 static bool
 z80CondJump(const lineNode *pl)
 {
-  if((strncmp(pl->line, "jp\t", 3) == 0 ||
-    strncmp(pl->line, "jr\t", 3) == 0) && strchr(pl->line, ',') != 0 ||
+  if(((strncmp(pl->line, "jp\t", 3) == 0 ||
+    strncmp(pl->line, "jr\t", 3) == 0) && strchr(pl->line, ',') != 0) ||
     strncmp(pl->line, "djnz\t", 5) == 0)
     return TRUE;
   return FALSE;