Replace WIN32_DLL with WIN32, which is defined by default in Visual Studio.

diff --git a/lib/common/const.h b/lib/common/const.h
index b38bee17660164fd32b75252c25d652970436ab9..1c4c47355d7b38d780f926fbeffdb7d84e6f7d7e 100644 (file)
--- a/lib/common/const.h
+++ b/lib/common/const.h
@@ -153,7 +153,7 @@
 /* for clusters */
 #define                CL_BACK         10      /* cost of backward pointing edge */
 #define                CL_OFFSET       8       /* margin of cluster box in PS points */
-#ifndef MSWIN32
+#ifndef WIN32
 #define                CL_CROSS        1000    /* cost of cluster skeleton edge crossing */
 #else
 #define                CL_CROSS        100     /* avoid 16 bit overflow */

diff --git a/lib/common/globals.h b/lib/common/globals.h
index dbbd2bec01a18b692db5054773f5ff22f9ea7ec8..dda4c7cbf1a178ddcc970ed6b8dd5448fc06e8e2 100644 (file)
--- a/lib/common/globals.h
+++ b/lib/common/globals.h
@@ -43,7 +43,7 @@
 #endif
 #endif
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/common/memory.h b/lib/common/memory.h
index a194585b3383cd5fc54f7fe4f63acb3cf10dfdb0..a31067ace738a15cbf9ddb1a13cd06c549d4b25a 100644 (file)
--- a/lib/common/memory.h
+++ b/lib/common/memory.h
@@ -45,7 +45,7 @@ extern "C" {
 #ifdef GVDLL
 #define extern __declspec(dllexport)
 #else
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/common/pointset.h b/lib/common/pointset.h
index 34e09d24ffbb8ebd3ce24aea044a07d0e01be3d3..701a354b4124710c1bc038688805decbe4ead824 100644 (file)
--- a/lib/common/pointset.h
+++ b/lib/common/pointset.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif
 
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/common/render.h b/lib/common/render.h
index 5ae9773ae541cc0977bd4bfb489e8dfb01a440ce..66d385dea957cf55b62823f1f100d6f86547d288 100644 (file)
--- a/lib/common/render.h
+++ b/lib/common/render.h
@@ -59,7 +59,7 @@ extern "C" {
     typedef void (*nodesizefn_t) (Agnode_t *, boolean);
 
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/common/utils.h b/lib/common/utils.h
index fe0ba62ff32db2b49c71872dba8679ea18fed1ac..c8214d591297cd44f24d52da093f3aadf66a620a 100644 (file)
--- a/lib/common/utils.h
+++ b/lib/common/utils.h
@@ -20,7 +20,7 @@ extern "C" {
 
 
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/glcomp/glcompdefs.h b/lib/glcomp/glcompdefs.h
index 923f0926ad23d2e8cbf91c2f96ddc07ba3e1b571..8417976045e52e24c3ea2c934a1fda6ff326b733 100644 (file)
--- a/lib/glcomp/glcompdefs.h
+++ b/lib/glcomp/glcompdefs.h
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <math.h>
-#ifdef _WIN32
+#ifdef WIN32
 #include <windows.h>
 #include <winuser.h>
 #include <tchar.h>

diff --git a/lib/glcomp/glcompfont.h b/lib/glcomp/glcompfont.h
index e79958b9aba38e58aca8061e9c397e30d7e85805..6f5d0bc9607e8ba06d7f3545976f7e7b34b5758c 100644 (file)
--- a/lib/glcomp/glcompfont.h
+++ b/lib/glcomp/glcompfont.h
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#ifdef _WIN32
+#ifdef WIN32
 #include "glpangofont.h"
 typedef float GLfloat;
 #else

diff --git a/lib/glcomp/glcomptext.h b/lib/glcomp/glcomptext.h
index a1ecb3bbd50c8d47bc5695e1cda95f973b2e256c..092728d29c0296f3382e0c2a987fc80bbcb7c264 100644 (file)
--- a/lib/glcomp/glcomptext.h
+++ b/lib/glcomp/glcomptext.h
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#ifdef _WIN32
+#ifdef WIN32
 #include "glpangofont.h"
 typedef float GLfloat;
 #else

diff --git a/lib/glcomp/glcomptexture.h b/lib/glcomp/glcomptexture.h
index a31288d0e5b93208d99aa28392e4d42a1b89a157..4e0cbe17d5c8fa4d7bba7fe6ff55c72454e71d83 100644 (file)
--- a/lib/glcomp/glcomptexture.h
+++ b/lib/glcomp/glcomptexture.h
@@ -18,7 +18,7 @@
 #ifndef glCompFontURE_H
 #define glCompFontURE_H
 
-#ifdef _WIN32
+#ifdef WIN32
 #include "windows.h"
 #endif
 #include <stdio.h>

diff --git a/lib/glcomp/glutils.h b/lib/glcomp/glutils.h
index a6d31d7c18b659fa510cc9bee9315f62a970bf5b..93ed697bd15be6bb613a457d91c4952154eba1f1 100644 (file)
--- a/lib/glcomp/glutils.h
+++ b/lib/glcomp/glutils.h
@@ -14,7 +14,7 @@
 
 #ifndef GLUTILS_H
 #define GLUTILS_H
-#ifdef _WIN32
+#ifdef WIN32
 #include "windows.h"
 #endif
 #include <GL/gl.h>

diff --git a/lib/gvc/gvc.h b/lib/gvc/gvc.h
index 1b1402568011b944cfb0831f1e50d22e22c997b6..b7cd5b7981a444401b5c4c62e3bf9b2ff37c0db4 100644 (file)
--- a/lib/gvc/gvc.h
+++ b/lib/gvc/gvc.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/gvc/gvcext.h b/lib/gvc/gvcext.h
index 189c78739b06c4502b5e6d068afa02f3f7746ec1..0f1ba5fcb18fcc8695dfa3a1dadf1a367ede4acc 100644 (file)
--- a/lib/gvc/gvcext.h
+++ b/lib/gvc/gvcext.h
@@ -64,7 +64,7 @@ extern "C" {
     typedef struct gvplugin_available_s gvplugin_available_t;
 
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 __declspec(dllimport) lt_symlist_t lt_preloaded_symbols[];
 #else
@@ -75,7 +75,7 @@ __declspec(dllimport) lt_symlist_t lt_preloaded_symbols[];
 /*end visual studio*/
 
 
-#ifndef WIN32_DLL
+#ifndef WIN32
 #if defined(GVDLL)
        __declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
 #else

diff --git a/lib/gvc/gvio.h b/lib/gvc/gvio.h
index 40f914c59f1b595863a2ef70ffae69b34ee988ed..9620d51026d04c9144d77758e0fb1722a21b8b4a 100644 (file)
--- a/lib/gvc/gvio.h
+++ b/lib/gvc/gvio.h
@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/gvc/gvplugin_loadimage.h b/lib/gvc/gvplugin_loadimage.h
index c675050ab5ef65f5e27ba29f5915d994e71768bf..8a97727809d1d791fc26945e235db6fddf1a5a49 100644 (file)
--- a/lib/gvc/gvplugin_loadimage.h
+++ b/lib/gvc/gvplugin_loadimage.h
@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/gvpr/gprstate.h b/lib/gvpr/gprstate.h
index c7dcda15868afb7cbed76e2422f3699a88f0b35d..9ad84434e2c0355b132d9bd31aeca0ca624f464c 100644 (file)
--- a/lib/gvpr/gprstate.h
+++ b/lib/gvpr/gprstate.h
@@ -82,7 +82,7 @@ extern "C" {
     extern void initGPRState(Gpr_t *, Vmalloc_t *);
     extern int validTVT(int);
 
-#ifdef WIN32_DLL
+#ifdef WIN32
     extern int pathisrelative (char* path);
 #endif
 

diff --git a/lib/pack/pack.h b/lib/pack/pack.h
index b833fd79eeef7ea7102fbb14b5f754302e598c23..eba152fc160b63c00559f579b26a220d790ba996 100644 (file)
--- a/lib/pack/pack.h
+++ b/lib/pack/pack.h
@@ -58,7 +58,7 @@ typedef unsigned int packval_t;
     } pack_info;
 
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

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

diff --git a/lib/pathplan/vis.h b/lib/pathplan/vis.h
index b8df860f102d4748e88515193437c8393d35e001..e6c44f3ac273ba9f4ac1a492de8f13ec2f6924b0 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_DLL
+#ifdef WIN32
 #ifndef PATHPLAN_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/vmalloc/vmalloc.h b/lib/vmalloc/vmalloc.h
index 597d97cdf152d3b8e356eaaab77121dd17ee6a8e..2a240273931b115ced909a72761ac6ce89664c42 100644 (file)
--- a/lib/vmalloc/vmalloc.h
+++ b/lib/vmalloc/vmalloc.h
@@ -110,7 +110,7 @@ extern "C" {
 #endif
 
 /*visual studio*/
-#ifdef WIN32_DLL
+#ifdef WIN32
 #ifndef VMALLOC_EXPORTS
 #define extern __declspec(dllimport)
 #else

diff --git a/lib/xdot/xdot.h b/lib/xdot/xdot.h
index 94f34accfc956e0c6a457fe8753779d93a7968ef..be843378a8a277fa03dc87ee1b17f8b2aa811499 100755 (executable)
--- a/lib/xdot/xdot.h
+++ b/lib/xdot/xdot.h
@@ -13,7 +13,7 @@
 #ifndef XDOT_H
 #define XDOT_H
 #include <stdio.h>
-#ifdef _WIN32
+#ifdef WIN32
 #include <windows.h>
 #endif