Replace WIN32 with _WIN32 in cdt, cgraph, pathplan

WIN32 is defined by the user, _WIN32 is set by the compiler to indicate
the platform. It is better to use the latter.
This commit replaces WIN32 with _WIN32 in source and header files of
lib/cdt, lib/cgraph and lib/pathplan.

diff --git a/lib/cdt/cdt.h b/lib/cdt/cdt.h
index 2c8b294aeed31d6c2c48a4c3388d2d9fbf4886ad..2a770777bb00c8a31ff494642e86ab0f679db1f3 100644 (file)
--- a/lib/cdt/cdt.h
+++ b/lib/cdt/cdt.h
@@ -15,7 +15,7 @@ extern "C" {
 #include <stddef.h>    /* size_t */
 #include <string.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #undef __EXPORT__
 #undef __IMPORT__
 #define __EXPORT__  __declspec (dllexport)

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

diff --git a/lib/pathplan/pathutil.h b/lib/pathplan/pathutil.h
index 36b17f57d8e8cf266fdb9fe5bd227082583a1fe4..c1e8be7d0de443e1e1237bbf957a97bd8712b83e 100644 (file)
--- a/lib/pathplan/pathutil.h
+++ b/lib/pathplan/pathutil.h
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 /*visual studio*/
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef PATHPLAN_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/pathplan/vis.h b/lib/pathplan/vis.h
index e6c44f3ac273ba9f4ac1a492de8f13ec2f6924b0..96022d3d41e9e9abd9b59dccd9f851b33b49822a 100644 (file)
--- a/lib/pathplan/vis.h
+++ b/lib/pathplan/vis.h
@@ -46,7 +46,7 @@ extern "C" {
        /* this is computed from the above */
        array2 vis;
     };
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef PATHPLAN_EXPORTS
 #define extern __declspec(dllimport)
 #endif