Fixed various Wundef warnings.

diff --git a/cmd/smyrna/gui/toolboxcallbacks.h b/cmd/smyrna/gui/toolboxcallbacks.h
index 34d2e2db621b65a2b3af97a08d62b6085b18aa8e..1266bb5b551139d94ee92e96ddd336978a697fc4 100755 (executable)
--- a/cmd/smyrna/gui/toolboxcallbacks.h
+++ b/cmd/smyrna/gui/toolboxcallbacks.h
@@ -15,7 +15,7 @@
 #define TOOLBOXCALLBACKS_H
 #include <gtk/gtk.h>
 #include "gui.h"
-#if WIN32
+#if defined(WIN32)
 #define _BB  __declspec(dllexport)
 #else
 #define _BB /**/

diff --git a/lib/cgraph/io.c b/lib/cgraph/io.c
index c677c4f6b5eb9b24ac23bd470be91a90ead737d1..8164379dc24873ff807203b1da9e0ebe04a2c73a 100644 (file)
--- a/lib/cgraph/io.c
+++ b/lib/cgraph/io.c
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <cghdr.h>
-#if WIN32
+#if defined(WIN32)
 #include <io.h>
 #endif
 

diff --git a/lib/cgraph/mem.c b/lib/cgraph/mem.c
index 391b3ac94822b10febfba6974a4210f42a2fc4ce..2c5544e78f0b286f66ecb5b8a4005eea905e1454 100644 (file)
--- a/lib/cgraph/mem.c
+++ b/lib/cgraph/mem.c
@@ -15,12 +15,12 @@
 
 /* memory management discipline and entry points */
 
-#if (HAVE_AST || HAVE_VMALLOC)
+#if defined(HAVE_AST) || defined(HAVE_VMALLOC)
 
        /* vmalloc based allocator */
 static void *memopen(void)
 {
-#if DEBUG || MEMDEBUG
+#if defined(DEBUG) || defined(MEMDEBUG)
     return vmopen(Vmdcheap, Vmdebug,
                  VM_MTDEBUG | VM_DBCHECK | VM_DBABORT | VM_TRACE);
 #else

diff --git a/lib/pathplan/route.c b/lib/pathplan/route.c
index 70ae5fa5d1288b6c44e029f37c5c9b3758aa7584..5ab2863f2e8b172a88d60ebfb68482f1f919f238 100644 (file)
--- a/lib/pathplan/route.c
+++ b/lib/pathplan/route.c
@@ -352,7 +352,7 @@ static int splinefits(Pedge_t * edges, int edgen, Ppoint_t pa,
            growops(opl + 4);
            for (pi = 1; pi < 4; pi++)
                ops[opl].x = sps[pi].x, ops[opl++].y = sps[pi].y;
-#if DEBUG >= 1
+#if defined(DEBUG) && DEBUG >= 1
            fprintf(stderr, "success: %f %f\n", a, b);
 #endif
            return 1;
@@ -362,7 +362,7 @@ static int splinefits(Pedge_t * edges, int edgen, Ppoint_t pa,
                growops(opl + 4);
                for (pi = 1; pi < 4; pi++)
                    ops[opl].x = sps[pi].x, ops[opl++].y = sps[pi].y;
-#if DEBUG >= 1
+#if defined(DEBUG) && DEBUG >= 1
                fprintf(stderr, "forced straight line: %f %f\n", a, b);
 #endif
                return 1;
@@ -374,7 +374,7 @@ static int splinefits(Pedge_t * edges, int edgen, Ppoint_t pa,
        else
            a = b = 0;
     }
-#if DEBUG >= 1
+#if defined(DEBUG) && DEBUG >= 1
     fprintf(stderr, "failure\n");
 #endif
     return 0;

diff --git a/lib/pathplan/shortest.c b/lib/pathplan/shortest.c
index fb47d68cded7e19a2834296b0cc7f81822c61066..e0c84128b15d77d7fe60393a2004aca5a7f5e4e6 100644 (file)
--- a/lib/pathplan/shortest.c
+++ b/lib/pathplan/shortest.c
@@ -162,7 +162,7 @@ int Pshortestpath(Ppoly_t * polyp, Ppoint_t * eps, Ppolyline_t * output)
        }
     }
 
-#if DEBUG >= 1
+#if defined(DEBUG) && DEBUG >= 1
     fprintf(stderr, "points\n%d\n", pnll);
     for (pnli = 0; pnli < pnll; pnli++)
        fprintf(stderr, "%f %f\n", pnls[pnli].pp->x, pnls[pnli].pp->y);
@@ -171,7 +171,7 @@ int Pshortestpath(Ppoly_t * polyp, Ppoint_t * eps, Ppolyline_t * output)
     /* generate list of triangles */
     triangulate(pnlps, pnll);
 
-#if DEBUG >= 2
+#if defined(DEBUG) && DEBUG >= 2
     fprintf(stderr, "triangles\n%d\n", tril);
     for (trii = 0; trii < tril; trii++)
        for (ei = 0; ei < 3; ei++)
@@ -283,7 +283,7 @@ int Pshortestpath(Ppoly_t * polyp, Ppoint_t * eps, Ppolyline_t * output)
            }
     }
 
-#if DEBUG >= 1
+#if defined(DEBUG) && DEBUG >= 1
     fprintf(stderr, "polypath");
     for (pnlp = &epnls[1]; pnlp; pnlp = pnlp->link)
        fprintf(stderr, " %f %f", pnlp->pp->x, pnlp->pp->y);

diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h
index b014b2eed0bf1cdd39dc2c8ba14c880aefd6873e..3a25954907508997d7cdc78edc2f8ad8138e0457 100644 (file)
--- a/lib/vmalloc/vmhdr.h
+++ b/lib/vmalloc/vmhdr.h
@@ -481,7 +481,7 @@ extern "C" {
 #if !_typ_ssize_t
     typedef int ssize_t;
 #endif
-#if !_WIN32
+#if !defined(_WIN32)
     extern Vmuchar_t *sbrk _ARG_((ssize_t));
 #endif