From 74eed9c522bd3eb976b98886cc01da12dc29ffc1 Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Sun, 30 Oct 2016 23:10:21 +0100 Subject: [PATCH] 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. --- lib/cdt/cdt.h | 2 +- lib/cgraph/io.c | 2 +- lib/pathplan/pathutil.h | 2 +- lib/pathplan/vis.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cdt/cdt.h b/lib/cdt/cdt.h index 2c8b294ae..2a770777b 100644 --- a/lib/cdt/cdt.h +++ b/lib/cdt/cdt.h @@ -15,7 +15,7 @@ extern "C" { #include /* size_t */ #include -#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 8164379dc..3910f44b4 100644 --- a/lib/cgraph/io.c +++ b/lib/cgraph/io.c @@ -13,7 +13,7 @@ #include #include -#if defined(WIN32) +#if defined(_WIN32) #include #endif diff --git a/lib/pathplan/pathutil.h b/lib/pathplan/pathutil.h index 36b17f57d..c1e8be7d0 100644 --- 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 e6c44f3ac..96022d3d4 100644 --- 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 -- 2.40.0