From: Emden R. Gansner Date: Mon, 29 Sep 2014 20:16:55 +0000 (-0400) Subject: Replace WIN32_DLL with WIN32, which is defined by default in Visual Studio. X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~158 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ae096d2175c63d9af3146975834046169879321;p=graphviz 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 b38bee176..1c4c47355 100644 --- 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 dbbd2bec0..dda4c7cbf 100644 --- 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 a194585b3..a31067ace 100644 --- 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 34e09d24f..701a354b4 100644 --- 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 5ae9773ae..66d385dea 100644 --- 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 fe0ba62ff..c8214d591 100644 --- 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 923f0926a..841797604 100644 --- a/lib/glcomp/glcompdefs.h +++ b/lib/glcomp/glcompdefs.h @@ -18,7 +18,7 @@ #include #include #include -#ifdef _WIN32 +#ifdef WIN32 #include #include #include diff --git a/lib/glcomp/glcompfont.h b/lib/glcomp/glcompfont.h index e79958b9a..6f5d0bc96 100644 --- a/lib/glcomp/glcompfont.h +++ b/lib/glcomp/glcompfont.h @@ -15,7 +15,7 @@ #include #include -#ifdef _WIN32 +#ifdef WIN32 #include "glpangofont.h" typedef float GLfloat; #else diff --git a/lib/glcomp/glcomptext.h b/lib/glcomp/glcomptext.h index a1ecb3bbd..092728d29 100644 --- a/lib/glcomp/glcomptext.h +++ b/lib/glcomp/glcomptext.h @@ -15,7 +15,7 @@ #include #include -#ifdef _WIN32 +#ifdef WIN32 #include "glpangofont.h" typedef float GLfloat; #else diff --git a/lib/glcomp/glcomptexture.h b/lib/glcomp/glcomptexture.h index a31288d0e..4e0cbe17d 100644 --- 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 diff --git a/lib/glcomp/glutils.h b/lib/glcomp/glutils.h index a6d31d7c1..93ed697bd 100644 --- 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 diff --git a/lib/gvc/gvc.h b/lib/gvc/gvc.h index 1b1402568..b7cd5b798 100644 --- 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 189c78739..0f1ba5fcb 100644 --- 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 40f914c59..9620d5102 100644 --- 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 c675050ab..8a9772780 100644 --- 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 c7dcda158..9ad84434e 100644 --- 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 b833fd79e..eba152fc1 100644 --- 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 4b4837751..36b17f57d 100644 --- 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 b8df860f1..e6c44f3ac 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_DLL +#ifdef WIN32 #ifndef PATHPLAN_EXPORTS #define extern __declspec(dllimport) #endif diff --git a/lib/vmalloc/vmalloc.h b/lib/vmalloc/vmalloc.h index 597d97cdf..2a2402739 100644 --- 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 94f34accf..be843378a 100755 --- a/lib/xdot/xdot.h +++ b/lib/xdot/xdot.h @@ -13,7 +13,7 @@ #ifndef XDOT_H #define XDOT_H #include -#ifdef _WIN32 +#ifdef WIN32 #include #endif