From 0bf089625bb47bd2ab30d7f60d81f6c6c613fe1d Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Wed, 11 Jan 2017 14:59:11 +0100 Subject: [PATCH] Replace checks for `WIN32` with `_WIN32` The preprocesser macro `WIN32` is defined by the user, while `_WIN32` is defined by the compiler. To improve consistantcy, and prevent errors caused by forgetting to define `WIN32` somewhere, it is better to use `_WIN32` to check for Windows. --- cmd/dot/dot.c | 4 ++-- cmd/dot/dot.vcxproj | 4 ++-- cmd/dotty/dotty.vcxproj | 4 ++-- cmd/edgepaint/edgepaint.vcxproj | 4 ++-- cmd/gvedit/csettings.cpp | 10 +++++----- cmd/gvedit/main.cpp | 4 ++-- cmd/gvmap/cluster.c | 4 ++-- cmd/gvmap/gvmap.c | 2 +- cmd/gvmap/gvmap.vcxproj | 4 ++-- cmd/gvpr/gvpr.vcxproj | 4 ++-- cmd/lefty/common.h | 2 +- cmd/lefty/lefty.vcxproj | 4 ++-- cmd/lefty/tbl.h | 2 +- cmd/lneato/lneato.vcxproj | 4 ++-- cmd/mingle/mingle.vcxproj | 4 ++-- cmd/smyrna/btree.c | 2 +- cmd/smyrna/btree.h | 2 +- cmd/smyrna/gui/callbacks.h | 2 +- cmd/smyrna/gui/frmobjectui.c | 2 +- cmd/smyrna/gui/glcompui.c | 2 +- cmd/smyrna/gui/gui.c | 2 +- cmd/smyrna/gui/toolboxcallbacks.h | 2 +- cmd/smyrna/main.c | 4 ++-- cmd/smyrna/polytess.c | 2 +- cmd/smyrna/smyrna.vcxproj | 4 ++-- cmd/smyrna/smyrnadefs.h | 6 +++--- cmd/tools/acyclic.vcxproj | 4 ++-- cmd/tools/bcomps.vcxproj | 4 ++-- cmd/tools/ccomps.vcxproj | 4 ++-- cmd/tools/convert.h | 2 +- cmd/tools/dijkstra.vcxproj | 4 ++-- cmd/tools/gc.vcxproj | 4 ++-- cmd/tools/gml2gv.h | 2 +- cmd/tools/gml2gv.vcxproj | 4 ++-- cmd/tools/graphml2gv.vcxproj | 4 ++-- cmd/tools/gv2gml.c | 2 +- cmd/tools/gv2gml.vcxproj | 4 ++-- cmd/tools/gvcolor.vcxproj | 4 ++-- cmd/tools/gvgen.vcxproj | 4 ++-- cmd/tools/gvpack.c | 6 +++--- cmd/tools/gvpack.vcxproj | 4 ++-- cmd/tools/gvpack_builtins.c | 2 +- cmd/tools/gxl2gv.vcxproj | 4 ++-- cmd/tools/mm2gv.vcxproj | 4 ++-- cmd/tools/nop.vcxproj | 4 ++-- cmd/tools/sccmap.vcxproj | 4 ++-- cmd/tools/tred.vcxproj | 4 ++-- cmd/tools/tred2.c | 2 +- cmd/tools/unflatten.vcxproj | 4 ++-- configure.ac | 4 ++-- contrib/diffimg/diffimg.c | 4 ++-- contrib/diffimg/diffimg.vcxproj | 4 ++-- contrib/prune/prune.c | 2 +- contrib/prune/prune.vcxproj | 4 ++-- doc/winbuild.html | 2 +- lib/ast/ast.vcxproj | 4 ++-- lib/cdt/cdt.vcxproj | 4 ++-- lib/cgraph/cgraph.vcxproj | 4 ++-- lib/circogen/gvcircogen.vcxproj | 4 ++-- lib/dotgen/gvdotgen.vcxproj | 4 ++-- lib/edgepaint/edgepaintlib.vcxproj | 4 ++-- lib/edgepaint/lab_gamut.h | 2 +- lib/edgepaint/lab_gamut.vcxproj | 4 ++-- lib/edgepaint/node_distinct_coloring.c | 2 +- lib/expr/exeval.c | 2 +- lib/expr/exlib.h | 2 +- lib/expr/exparse.y | 2 +- lib/expr/expr.vcxproj | 4 ++-- lib/fdpgen/gvfdpgen.vcxproj | 4 ++-- lib/fdpgen/tlayout.c | 4 ++-- lib/glcomp/glcomp.vcxproj | 4 ++-- lib/glcomp/glcompdefs.h | 4 ++-- lib/glcomp/glcompfont.h | 2 +- lib/glcomp/glcomptext.h | 2 +- lib/glcomp/glcomptexture.h | 2 +- lib/glcomp/glutils.h | 2 +- lib/gvc.vcxproj | 2 +- lib/gvc/gvc.h | 2 +- lib/gvc/gvcext.h | 4 ++-- lib/gvc/gvcint.h | 2 +- lib/gvc/gvconfig.c | 14 +++++++------- lib/gvc/gvdevice.c | 4 ++-- lib/gvc/gvio.h | 2 +- lib/gvc/gvplugin.c | 8 ++++---- lib/gvc/gvplugin_loadimage.h | 2 +- lib/gvc/gvusershape.c | 4 ++-- lib/gvpr/actions.c | 4 ++-- lib/gvpr/compile.c | 6 +++--- lib/gvpr/gprstate.c | 2 +- lib/gvpr/gprstate.h | 2 +- lib/gvpr/gvpr.c | 2 +- lib/gvpr/gvprlib.vcxproj | 4 ++-- lib/ingraphs/ingraphs.vcxproj | 4 ++-- lib/mingle/minglelib.vcxproj | 4 ++-- lib/neatogen/gvneatogen.vcxproj | 4 ++-- lib/neatogen/neatoinit.c | 4 ++-- lib/neatogen/quad_prog_vpsc.c | 16 ++++++++-------- lib/neatogen/stuff.c | 2 +- lib/ortho/gvortho.vcxproj | 4 ++-- lib/ortho/partition.c | 2 +- lib/osage/osage.vcxproj | 4 ++-- lib/pack/pack.h | 2 +- lib/patchwork/gvpatchwork.vcxproj | 4 ++-- lib/pathplan/Pathplan.vcxproj | 4 ++-- lib/rbtree/rbtree.vcxproj | 4 ++-- lib/sfdpgen/sfdp.vcxproj | 4 ++-- lib/sfio/sfexit.c | 2 +- lib/sfio/sfhdr.h | 8 ++++---- lib/sfio/sfio.vcxproj | 4 ++-- lib/sfio/sfmode.c | 2 +- lib/sfio/sfopen.c | 4 ++-- lib/sfio/sfpopen.c | 2 +- lib/sparse/gvsparse.vcxproj | 4 ++-- lib/topfish/topfish.vcxproj | 4 ++-- lib/twopigen/gvtwopigen.vcxproj | 4 ++-- lib/vmalloc/vmalloc.vcxproj | 4 ++-- lib/vmalloc/vmhdr.h | 8 ++++---- lib/vpsc/csolve_VPSC.cpp | 8 ++++---- lib/vpsc/vpsc.vcxproj | 4 ++-- lib/xdot/xdot.h | 2 +- lib/xdot/xdot.vcxproj | 4 ++-- plugin/core/gvplugin_core.c | 16 ++++++++-------- plugin/core/gvplugin_core.vcxproj | 4 ++-- plugin/core/gvrender_core_dot.c | 2 +- plugin/core/gvrender_core_fig.c | 2 +- plugin/core/gvrender_core_hpgl.c | 2 +- plugin/core/gvrender_core_json.c | 2 +- plugin/core/gvrender_core_mp.c | 2 +- plugin/core/gvrender_core_vtx.c | 2 +- plugin/dot_layout/gvplugin_dot_layout.vcxproj | 4 ++-- plugin/gd/gvplugin_gd.vcxproj | 4 ++-- plugin/gd/gvrender_gd.c | 2 +- plugin/gdiplus/gvplugin_gdiplus.vcxproj | 4 ++-- plugin/gdk/gvloadimage_gdk.c | 2 +- plugin/gs/gvloadimage_gs.c | 2 +- .../neato_layout/gvplugin_neato_layout.vcxproj | 4 ++-- plugin/pango/gvgetfontlist_pango.c | 2 +- plugin/pango/gvplugin_pango.vcxproj | 4 ++-- plugin/pango/gvtextlayout_pango.c | 2 +- plugin/poppler/gvloadimage_poppler.c | 2 +- plugin/rsvg/gvloadimage_rsvg.c | 2 +- plugin/visio/gvplugin_visio.c | 2 +- plugin/webp/gvloadimage_webp.c | 2 +- tclpkg/gdtclft/gdtclft.c | 2 +- windows/include/ps_font_equiv.h | 2 +- 145 files changed, 262 insertions(+), 262 deletions(-) diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c index 343513b0c..04baa9eea 100644 --- a/cmd/dot/dot.c +++ b/cmd/dot/dot.c @@ -37,7 +37,7 @@ __declspec(dllimport) int GvExitOnUsage; static GVC_t *Gvc; static graph_t * G; -#ifndef WIN32 +#ifndef _WIN32 static void intr(int s) { /* if interrupted we try to produce a partial rendering before exiting */ @@ -100,7 +100,7 @@ int main(int argc, char **argv) Gvc = gvContextPlugins(lt_preloaded_symbols, DEMAND_LOADING); GvExitOnUsage = 1; gvParseArgs(Gvc, argc, argv); -#ifndef WIN32 +#ifndef _WIN32 signal(SIGUSR1, gvToggle); signal(SIGINT, intr); #ifndef NO_FPERR diff --git a/cmd/dot/dot.vcxproj b/cmd/dot/dot.vcxproj index 05cddd32d..c3cb8d367 100644 --- a/cmd/dot/dot.vcxproj +++ b/cmd/dot/dot.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -74,7 +74,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/dotty/dotty.vcxproj b/cmd/dotty/dotty.vcxproj index 98de7cf08..260c75c14 100644 --- a/cmd/dotty/dotty.vcxproj +++ b/cmd/dotty/dotty.vcxproj @@ -53,7 +53,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -74,7 +74,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/edgepaint/edgepaint.vcxproj b/cmd/edgepaint/edgepaint.vcxproj index 11bd67f76..b82bf252d 100644 --- a/cmd/edgepaint/edgepaint.vcxproj +++ b/cmd/edgepaint/edgepaint.vcxproj @@ -55,7 +55,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ MaxSpeed true $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp index d362bca1b..abd321b61 100644 --- a/cmd/gvedit/csettings.cpp +++ b/cmd/gvedit/csettings.cpp @@ -10,7 +10,7 @@ * * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef WIN32 +#ifdef _WIN32 #include "windows.h" #endif #include "csettings.h" @@ -32,7 +32,7 @@ typedef struct { int cur; } rdr_t; -#ifdef WIN32 +#ifdef _WIN32 #define BSZ 1024 QString findAttrFile () @@ -119,7 +119,7 @@ CFrmSettings::CFrmSettings() graph = NULL; activeWindow = NULL; QString path; -#ifndef WIN32 +#ifndef _WIN32 char *s = getenv("GVEDIT_PATH"); if (s) path = s; @@ -149,7 +149,7 @@ CFrmSettings::CFrmSettings() scopeChangedSlot(0); -#ifndef WIN32 +#ifndef _WIN32 loadAttrs(path + "/attrs.txt", WIDGET(QComboBox, cbNameG), WIDGET(QComboBox, cbNameN), WIDGET(QComboBox, cbNameE)); #else @@ -397,7 +397,7 @@ bool CFrmSettings::renderLayout() if (fileName != activeWindow->outputFile) activeWindow->outputFile = fileName; -#ifdef WIN32 +#ifdef _WIN32 if ((!fileName.contains('/')) && (!fileName.contains('\\'))) #else if (!fileName.contains('/')) diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp index 2510c7697..bb4c2546b 100644 --- a/cmd/gvedit/main.cpp +++ b/cmd/gvedit/main.cpp @@ -13,7 +13,7 @@ #include "config.h" -#ifdef WIN32 +#ifdef _WIN32 #include "windows.h" #endif #include @@ -27,7 +27,7 @@ #include "globals.h" -#ifdef WIN32 +#ifdef _WIN32 /*gvc.lib cgraph.lib*/ #pragma comment( lib, "cgraph.lib" ) #pragma comment( lib, "gvc.lib" ) diff --git a/cmd/gvmap/cluster.c b/cmd/gvmap/cluster.c index bd74b66cc..55e4d587f 100644 --- a/cmd/gvmap/cluster.c +++ b/cmd/gvmap/cluster.c @@ -31,7 +31,7 @@ #include "DotIO.h" #include "colorutil.h" -#ifdef WIN32 /*dependencies*/ +#ifdef _WIN32 /*dependencies*/ #pragma comment( lib, "cgraph.lib" ) #pragma comment( lib, "gvc.lib" ) #pragma comment( lib, "ingraphs.lib" ) @@ -41,7 +41,7 @@ #pragma comment( lib, "neatogen.lib" ) #pragma comment( lib, "rbtree.lib" ) #pragma comment( lib, "cdt.lib" ) -#endif /* not WIN32_DLL */ +#endif /* not _WIN32 */ enum {POINTS_ALL = 1, POINTS_LABEL, POINTS_RANDOM}; enum {maxlen = 10000000}; diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c index 67135d911..121d8175c 100644 --- a/cmd/gvmap/gvmap.c +++ b/cmd/gvmap/gvmap.c @@ -32,7 +32,7 @@ #include "colorutil.h" #include "color_palette.h" -#ifdef WIN32 +#ifdef _WIN32 #define strdup(x) _strdup(x) #endif enum {POINTS_ALL = 1, POINTS_LABEL, POINTS_RANDOM}; diff --git a/cmd/gvmap/gvmap.vcxproj b/cmd/gvmap/gvmap.vcxproj index c240b8c85..7566771b2 100644 --- a/cmd/gvmap/gvmap.vcxproj +++ b/cmd/gvmap/gvmap.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -73,7 +73,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/gvpr/gvpr.vcxproj b/cmd/gvpr/gvpr.vcxproj index edd4748e0..59b691f18 100644 --- a/cmd/gvpr/gvpr.vcxproj +++ b/cmd/gvpr/gvpr.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\gvpr - MSWIN32;WIN32;_DEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions) + MSWIN32;_DEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\gvpr - WIN32;NDEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/lefty/common.h b/cmd/lefty/common.h index 7d34fd981..b48594336 100644 --- a/cmd/lefty/common.h +++ b/cmd/lefty/common.h @@ -28,7 +28,7 @@ extern "C" { */ #define FEATURE_MINTSIZE 1 #define FEATURE_DOT 1 -#if defined(WIN32) || defined(MSWIN32) +#if defined(_WIN32) || defined(MSWIN32) #ifndef FEATURE_WIN32 #define FEATURE_WIN32 1 #endif diff --git a/cmd/lefty/lefty.vcxproj b/cmd/lefty/lefty.vcxproj index 4e9dd6ca0..cafe91f47 100644 --- a/cmd/lefty/lefty.vcxproj +++ b/cmd/lefty/lefty.vcxproj @@ -53,7 +53,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\freetype2;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)/libltdl;$(SolutionDir)/lib/neatogen;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;$(SolutionDir)/cmd/lefty/ws/mswin32;$(SolutionDir)/cmd/lefty;$(SolutionDir)/cmd/lefty/dot2l;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\freetype2;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)/libltdl;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;$(SolutionDir)/cmd/lefty/ws/mswin32;$(SolutionDir)/cmd/lefty;$(SolutionDir)/cmd/lefty/dot2l;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings diff --git a/cmd/lefty/tbl.h b/cmd/lefty/tbl.h index 62f29537e..f97e3f849 100644 --- a/cmd/lefty/tbl.h +++ b/cmd/lefty/tbl.h @@ -19,7 +19,7 @@ extern "C" { #ifndef _TBL_H #define _TBL_H -#ifdef WIN32 +#ifdef _WIN32 #include "mem.h" #endif diff --git a/cmd/lneato/lneato.vcxproj b/cmd/lneato/lneato.vcxproj index df77e66fe..554bf9fb3 100644 --- a/cmd/lneato/lneato.vcxproj +++ b/cmd/lneato/lneato.vcxproj @@ -51,7 +51,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -70,7 +70,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/mingle/mingle.vcxproj b/cmd/mingle/mingle.vcxproj index 4626a0762..0c393f84b 100644 --- a/cmd/mingle/mingle.vcxproj +++ b/cmd/mingle/mingle.vcxproj @@ -55,7 +55,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -81,7 +81,7 @@ MaxSpeed true $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/cmd/smyrna/btree.c b/cmd/smyrna/btree.c index 396b7cb1a..ac62b51f5 100644 --- a/cmd/smyrna/btree.c +++ b/cmd/smyrna/btree.c @@ -12,7 +12,7 @@ *************************************************************************/ #include "btree.h" -#ifdef WIN32 +#ifdef _WIN32 #include "regex_win32.h" #else #include "regex.h" diff --git a/cmd/smyrna/btree.h b/cmd/smyrna/btree.h index e83b7aaaa..ac6d1493b 100644 --- a/cmd/smyrna/btree.h +++ b/cmd/smyrna/btree.h @@ -15,7 +15,7 @@ #define BTREE_H #include "tvnodes.h" -#ifdef WIN32 +#ifdef _WIN32 #include "regex_win32.h" #endif diff --git a/cmd/smyrna/gui/callbacks.h b/cmd/smyrna/gui/callbacks.h index ab19e0eef..b2c9b5ff9 100755 --- a/cmd/smyrna/gui/callbacks.h +++ b/cmd/smyrna/gui/callbacks.h @@ -21,7 +21,7 @@ extern "C" { #endif -#ifdef WIN32 //this shit is needed on WIN32 to get libglade see the callback +#ifdef _WIN32 //this shit is needed on _WIN32 to get libglade see the callback #define _BB __declspec(dllexport) #else #define _BB diff --git a/cmd/smyrna/gui/frmobjectui.c b/cmd/smyrna/gui/frmobjectui.c index 390d062b7..b64543a15 100644 --- a/cmd/smyrna/gui/frmobjectui.c +++ b/cmd/smyrna/gui/frmobjectui.c @@ -29,7 +29,7 @@ -#ifdef WIN32 +#ifdef _WIN32 #define STRCASECMP stricmp #else #include diff --git a/cmd/smyrna/gui/glcompui.c b/cmd/smyrna/gui/glcompui.c index 53986e592..56f36e07b 100644 --- a/cmd/smyrna/gui/glcompui.c +++ b/cmd/smyrna/gui/glcompui.c @@ -381,7 +381,7 @@ glCompSet *glcreate_gl_topview_menu(void) #if 0 int getIconsDirectory(char *bf) { -#ifdef WIN32 +#ifdef _WIN32 int a = GetCurrentDirectory(512, bf); if ((a > 512) || (a == 0)) return 0; diff --git a/cmd/smyrna/gui/gui.c b/cmd/smyrna/gui/gui.c index 4096c0b37..0dddc9b0f 100755 --- a/cmd/smyrna/gui/gui.c +++ b/cmd/smyrna/gui/gui.c @@ -25,7 +25,7 @@ static char guibuffer[BUFSIZ]; //general purpose buffer -#ifdef WIN32 +#ifdef _WIN32 extern int strcasecmp(const char *s1, const char *s2); extern int strncasecmp(const char *s1, const char *s2, unsigned int n); #endif diff --git a/cmd/smyrna/gui/toolboxcallbacks.h b/cmd/smyrna/gui/toolboxcallbacks.h index 1266bb5b5..2ec072c33 100755 --- a/cmd/smyrna/gui/toolboxcallbacks.h +++ b/cmd/smyrna/gui/toolboxcallbacks.h @@ -15,7 +15,7 @@ #define TOOLBOXCALLBACKS_H #include #include "gui.h" -#if defined(WIN32) +#if defined(_WIN32) #define _BB __declspec(dllexport) #else #define _BB /**/ diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c index a3e6f6aa4..5f417ebf0 100755 --- a/cmd/smyrna/main.c +++ b/cmd/smyrna/main.c @@ -65,7 +65,7 @@ char *smyrnaPath(char *suffix) char *buf; static int baselen; int slen; -#ifdef WIN32 +#ifdef _WIN32 char *pathSep = "\\"; #else char *pathSep = "/"; @@ -210,7 +210,7 @@ static void windowedMode(int argc, char *argv[]) create_window(glconfig, gladewidget); change_cursor(GDK_TOP_LEFT_ARROW); -#ifndef WIN32 +#ifndef _WIN32 glutInit(&argc, argv); #endif diff --git a/cmd/smyrna/polytess.c b/cmd/smyrna/polytess.c index 859b313cc..2c96d6fc1 100644 --- a/cmd/smyrna/polytess.c +++ b/cmd/smyrna/polytess.c @@ -89,7 +89,7 @@ GLdouble complex[25][3] = { 0.0f, 0.0f, 0.0f, #endif -#ifndef WIN32 +#ifndef _WIN32 #define CALLBACK #endif static void CALLBACK combineCallback(GLdouble coords[3], GLdouble *vertex_data[4],GLfloat weight[4], GLdouble **dataOut) diff --git a/cmd/smyrna/smyrna.vcxproj b/cmd/smyrna/smyrna.vcxproj index aaae58905..259371415 100644 --- a/cmd/smyrna/smyrna.vcxproj +++ b/cmd/smyrna/smyrna.vcxproj @@ -53,7 +53,7 @@ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) Disabled $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\freeglut\include;$(SolutionDir)windows\dependencies\GTK2\include\libglade-2.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtkglext-1.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtkglext-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\atk-1.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include\cairo;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtk-2.0\;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -102,7 +102,7 @@ $(SolutionDir)windows\dependencies\GTK2\bin\pango-querymodules.exe > $(OutDir $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\freeglut\include;$(SolutionDir)windows\dependencies\GTK2\include\libglade-2.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtkglext-1.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtkglext-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\atk-1.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include\cairo;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtk-2.0\;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h index 1e86d8466..0106af2f2 100644 --- a/cmd/smyrna/smyrnadefs.h +++ b/cmd/smyrna/smyrnadefs.h @@ -13,12 +13,12 @@ #ifndef SMYRNADEFS_H #define SMYRNADEFS_H -#ifdef WIN32 +#ifdef _WIN32 #ifndef NO_WIN_HEADER #include "windows.h" #endif #endif -#ifdef WIN32 //this is needed on WIN32 to get libglade see the callback +#ifdef _WIN32 //this is needed on _WIN32 to get libglade see the callback #define _BB __declspec(dllexport) #else #define _BB @@ -39,7 +39,7 @@ extern "C" { #endif -#ifdef WIN32 //this is needed on WIN32 to get libglade see the callback +#ifdef _WIN32 //this is needed on _WIN32 to get libglade see the callback #define _BB __declspec(dllexport) #else #define _BB diff --git a/cmd/tools/acyclic.vcxproj b/cmd/tools/acyclic.vcxproj index 687c9eaa1..597c2bce2 100644 --- a/cmd/tools/acyclic.vcxproj +++ b/cmd/tools/acyclic.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/bcomps.vcxproj b/cmd/tools/bcomps.vcxproj index 0d0eb456b..64cac7625 100644 --- a/cmd/tools/bcomps.vcxproj +++ b/cmd/tools/bcomps.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/ccomps.vcxproj b/cmd/tools/ccomps.vcxproj index b4c5a3235..82f467bf7 100644 --- a/cmd/tools/ccomps.vcxproj +++ b/cmd/tools/ccomps.vcxproj @@ -53,7 +53,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/convert.h b/cmd/tools/convert.h index 17731bd58..da2bd74d1 100644 --- a/cmd/tools/convert.h +++ b/cmd/tools/convert.h @@ -27,7 +27,7 @@ extern "C" { #include "cgraph.h" #include "cghdr.h" -#ifdef WIN32 +#ifdef _WIN32 #define strdup(x) _strdup(x) #endif diff --git a/cmd/tools/dijkstra.vcxproj b/cmd/tools/dijkstra.vcxproj index 1c58de0ce..bf917ce6d 100644 --- a/cmd/tools/dijkstra.vcxproj +++ b/cmd/tools/dijkstra.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/gc.vcxproj b/cmd/tools/gc.vcxproj index 95e12f3d4..b41efde23 100644 --- a/cmd/tools/gc.vcxproj +++ b/cmd/tools/gc.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/gml2gv.h b/cmd/tools/gml2gv.h index dcc9d8556..7b796db77 100644 --- a/cmd/tools/gml2gv.h +++ b/cmd/tools/gml2gv.h @@ -4,7 +4,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #define strdup(x) _strdup(x) #endif diff --git a/cmd/tools/gml2gv.vcxproj b/cmd/tools/gml2gv.vcxproj index 8a77ab63a..3c960ef55 100644 --- a/cmd/tools/gml2gv.vcxproj +++ b/cmd/tools/gml2gv.vcxproj @@ -54,7 +54,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -85,7 +85,7 @@ del gmlparse-intermediate.c $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/graphml2gv.vcxproj b/cmd/tools/graphml2gv.vcxproj index cacd187fa..d6cf1db5b 100644 --- a/cmd/tools/graphml2gv.vcxproj +++ b/cmd/tools/graphml2gv.vcxproj @@ -54,7 +54,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/gv2gml.c b/cmd/tools/gv2gml.c index 5d01c4985..bc880555f 100644 --- a/cmd/tools/gv2gml.c +++ b/cmd/tools/gv2gml.c @@ -121,7 +121,7 @@ parseStyle (char* s) char* ip; char* sep = " \t,"; -#ifdef WIN32 +#ifdef _WIN32 s = _strdup(s); #else s = strdup(s); diff --git a/cmd/tools/gv2gml.vcxproj b/cmd/tools/gv2gml.vcxproj index c2444144b..cedbddc77 100644 --- a/cmd/tools/gv2gml.vcxproj +++ b/cmd/tools/gv2gml.vcxproj @@ -54,7 +54,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/gvcolor.vcxproj b/cmd/tools/gvcolor.vcxproj index b61cf5682..1cce25aaf 100644 --- a/cmd/tools/gvcolor.vcxproj +++ b/cmd/tools/gvcolor.vcxproj @@ -53,7 +53,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/gvgen.vcxproj b/cmd/tools/gvgen.vcxproj index 1bb141cd1..de62cd70d 100644 --- a/cmd/tools/gvgen.vcxproj +++ b/cmd/tools/gvgen.vcxproj @@ -50,7 +50,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -71,7 +71,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c index e3ae8f824..f3c73f6b0 100644 --- a/cmd/tools/gvpack.c +++ b/cmd/tools/gvpack.c @@ -30,7 +30,7 @@ #include "pack.h" /*visual studio*/ -#if defined(WIN32) +#if defined(_WIN32) #define extern __declspec(dllimport) #endif /*end visual studio*/ @@ -38,7 +38,7 @@ extern gvplugin_library_t gvplugin_neato_layout_LTX_library; #undef extern lt_symlist_t lt_preloaded_symbols[] = { -#if defined(WIN32) +#if defined(_WIN32) { "gvplugin_neato_layout_LTX_library", 0 }, #else { "gvplugin_neato_layout_LTX_library", (void*)(&gvplugin_neato_layout_LTX_library) }, @@ -872,7 +872,7 @@ int main(int argc, char *argv[]) doPack = (pinfo.mode != l_undef); -#if defined(WIN32) +#if defined(_WIN32) lt_preloaded_symbols[0].address = (void*)(&gvplugin_neato_layout_LTX_library); #endif gvc = gvContextPlugins(lt_preloaded_symbols, DEMAND_LOADING); diff --git a/cmd/tools/gvpack.vcxproj b/cmd/tools/gvpack.vcxproj index e3f25bf14..f91bc94a9 100644 --- a/cmd/tools/gvpack.vcxproj +++ b/cmd/tools/gvpack.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/gvpack_builtins.c b/cmd/tools/gvpack_builtins.c index bcac04d34..eb832908a 100644 --- a/cmd/tools/gvpack_builtins.c +++ b/cmd/tools/gvpack_builtins.c @@ -14,7 +14,7 @@ #include "gvplugin.h" /*visual studio*/ -#if defined(WIN32) +#if defined(_WIN32) #define extern __declspec(dllimport) #endif /*end visual studio*/ diff --git a/cmd/tools/gxl2gv.vcxproj b/cmd/tools/gxl2gv.vcxproj index ec83e7b14..935c15046 100644 --- a/cmd/tools/gxl2gv.vcxproj +++ b/cmd/tools/gxl2gv.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;MSWIN32;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;MSWIN32;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -79,7 +79,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/mm2gv.vcxproj b/cmd/tools/mm2gv.vcxproj index e0a956735..e9c456211 100644 --- a/cmd/tools/mm2gv.vcxproj +++ b/cmd/tools/mm2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/nop.vcxproj b/cmd/tools/nop.vcxproj index 825bc83d2..f7ef8c4e5 100644 --- a/cmd/tools/nop.vcxproj +++ b/cmd/tools/nop.vcxproj @@ -53,7 +53,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/sccmap.vcxproj b/cmd/tools/sccmap.vcxproj index 8c928f682..06022e059 100644 --- a/cmd/tools/sccmap.vcxproj +++ b/cmd/tools/sccmap.vcxproj @@ -53,7 +53,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/tred.vcxproj b/cmd/tools/tred.vcxproj index 87a8c83a9..feeef415d 100644 --- a/cmd/tools/tred.vcxproj +++ b/cmd/tools/tred.vcxproj @@ -53,7 +53,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ - WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/tred2.c b/cmd/tools/tred2.c index a11b4e22d..ccfd897cf 100644 --- a/cmd/tools/tred2.c +++ b/cmd/tools/tred2.c @@ -38,7 +38,7 @@ char **Files; char *CmdName; -#ifdef WIN32 //*dependencies +#ifdef _WIN32 //*dependencies #pragma comment( lib, "cgraph.lib" ) #pragma comment( lib, "ingraphs.lib" ) #pragma comment( lib, "gvc.lib" ) diff --git a/cmd/tools/unflatten.vcxproj b/cmd/tools/unflatten.vcxproj index b6e843b62..348b2d392 100644 --- a/cmd/tools/unflatten.vcxproj +++ b/cmd/tools/unflatten.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) Level4 true diff --git a/configure.ac b/configure.ac index 4973b3cdd..17a721c53 100644 --- a/configure.ac +++ b/configure.ac @@ -137,8 +137,8 @@ case "${host_os}" in *uwin* ) UWIN=yes DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WINNT/Fonts;C:/winnt/fonts" - CFLAGS="${CFLAGS} -DWIN32 -DMSWIN32" - CXXFLAGS="${CXXFLAGS} -DWIN32 -DMSWIN32" + CFLAGS="${CFLAGS} -DMSWIN32" + CXXFLAGS="${CXXFLAGS} -DMSWIN32" PATHSEPARATOR=";" NO_POSTSCRIPT_ALIAS=1 BROWSER="xdg-open" diff --git a/contrib/diffimg/diffimg.c b/contrib/diffimg/diffimg.c index c0a26d163..fc15e25e3 100644 --- a/contrib/diffimg/diffimg.c +++ b/contrib/diffimg/diffimg.c @@ -30,11 +30,11 @@ #include #include #include -#ifndef WIN32 +#ifndef _WIN32 //#include #endif -#ifdef WIN32 +#ifdef _WIN32 #define EX_USAGE 64 #define EX_DATAERR 65 #define EX_NOINPUT 66 diff --git a/contrib/diffimg/diffimg.vcxproj b/contrib/diffimg/diffimg.vcxproj index fe16f1952..a8133d411 100644 --- a/contrib/diffimg/diffimg.vcxproj +++ b/contrib/diffimg/diffimg.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libgd\src - WIN32;_DEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -77,7 +77,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libgd\src - WIN32;NDEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/contrib/prune/prune.c b/contrib/prune/prune.c index 8219ba0c8..7df847fd4 100644 --- a/contrib/prune/prune.c +++ b/contrib/prune/prune.c @@ -14,7 +14,7 @@ #include "config.h" #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #include diff --git a/contrib/prune/prune.vcxproj b/contrib/prune/prune.vcxproj index b4f69c37f..ce0ccbdf1 100644 --- a/contrib/prune/prune.vcxproj +++ b/contrib/prune/prune.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -74,7 +74,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/doc/winbuild.html b/doc/winbuild.html index 01aecbf4c..ee98186d5 100644 --- a/doc/winbuild.html +++ b/doc/winbuild.html @@ -205,7 +205,7 @@ that produces Windows-compatible results. 
     case "$host_os" in
      mingw*)
-       DEFS="$DEFS -DWIN32 -DMSWIN32"
+       DEFS="$DEFS -DMSWIN32"
        ;;
      esac
diff --git a/lib/ast/ast.vcxproj b/lib/ast/ast.vcxproj index ff6395967..51b1a3ca1 100644 --- a/lib/ast/ast.vcxproj +++ b/lib/ast/ast.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\sfio - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\sfio - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/cdt/cdt.vcxproj b/lib/cdt/cdt.vcxproj index 158f789a6..33a54c764 100644 --- a/lib/cdt/cdt.vcxproj +++ b/lib/cdt/cdt.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir) - WIN32;_DEBUG;_WINDOWS;_USRDLL;CDT_EXPORTS;WIN32_DLL;_BLD_cdt ;__EXPORT__;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;CDT_EXPORTS;WIN32_DLL;_BLD_cdt ;__EXPORT__;%(PreprocessorDefinitions) MultiThreadedDebugDLL Level4 @@ -72,7 +72,7 @@ $(ProjectDir) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CDT_EXPORTS;WIN32_DLL;_BLD_cdt;__EXPORT__;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;CDT_EXPORTS;WIN32_DLL;_BLD_cdt;__EXPORT__;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/cgraph/cgraph.vcxproj b/lib/cgraph/cgraph.vcxproj index 51c187d3c..4d79ff05b 100644 --- a/lib/cgraph/cgraph.vcxproj +++ b/lib/cgraph/cgraph.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt - WIN32;_DEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;_DLL_BLD;_dll_import;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;_DLL_BLD;_dll_import;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ flex -oscan.c scan.l $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt - WIN32;NDEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/circogen/gvcircogen.vcxproj b/lib/circogen/gvcircogen.vcxproj index 4164e91b0..baa57d601 100644 --- a/lib/circogen/gvcircogen.vcxproj +++ b/lib/circogen/gvcircogen.vcxproj @@ -53,7 +53,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse - WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/dotgen/gvdotgen.vcxproj b/lib/dotgen/gvdotgen.vcxproj index 7e7be8543..cea76d9e8 100644 --- a/lib/dotgen/gvdotgen.vcxproj +++ b/lib/dotgen/gvdotgen.vcxproj @@ -53,7 +53,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ortho;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\pack;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_DLL;_TEST_;%(PreprocessorDefinitions) + _DEBUG;_LIB;WIN32_DLL;_TEST_;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ortho;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\pack;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/edgepaint/edgepaintlib.vcxproj b/lib/edgepaint/edgepaintlib.vcxproj index 0449f9c29..ebb2c7c89 100644 --- a/lib/edgepaint/edgepaintlib.vcxproj +++ b/lib/edgepaint/edgepaintlib.vcxproj @@ -55,7 +55,7 @@ Disabled $(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -72,7 +72,7 @@ MaxSpeed true $(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/lib/edgepaint/lab_gamut.h b/lib/edgepaint/lab_gamut.h index 63f157ec6..03393428a 100644 --- a/lib/edgepaint/lab_gamut.h +++ b/lib/edgepaint/lab_gamut.h @@ -20,7 +20,7 @@ typedef struct { } char_color_lab; /*visual studio*/ -#if defined(WIN32) && !defined(LAB_GAMUT_EXPORTS) +#if defined(_WIN32) && !defined(LAB_GAMUT_EXPORTS) #define extern __declspec(dllimport) #endif /*end visual studio*/ diff --git a/lib/edgepaint/lab_gamut.vcxproj b/lib/edgepaint/lab_gamut.vcxproj index e8d3ad1ae..178008d63 100644 --- a/lib/edgepaint/lab_gamut.vcxproj +++ b/lib/edgepaint/lab_gamut.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)lib\edgepaint;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ $(SolutionDir)lib\edgepaint;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/edgepaint/node_distinct_coloring.c b/lib/edgepaint/node_distinct_coloring.c index b3d8295fa..9c5bb0325 100644 --- a/lib/edgepaint/node_distinct_coloring.c +++ b/lib/edgepaint/node_distinct_coloring.c @@ -15,7 +15,7 @@ #include "furtherest_point.h" #include "color_palette.h" -#ifndef WIN32 +#ifndef _WIN32 inline #endif static real mydist(int dim, real *x, real *y){ diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c index 592e1f1ca..ce2d30cb1 100644 --- a/lib/expr/exeval.c +++ b/lib/expr/exeval.c @@ -28,7 +28,7 @@ #include #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #define srand48 srand #define drand48 rand diff --git a/lib/expr/exlib.h b/lib/expr/exlib.h index 1ab24efa7..834224af8 100644 --- a/lib/expr/exlib.h +++ b/lib/expr/exlib.h @@ -183,7 +183,7 @@ extern const char* exversion; extern Exstate_t expr; extern int exparse(void); /* yacc should do this */ -#if defined(WIN32) +#if defined(_WIN32) #define strtoll _strtoi64 #define strtoull _strtoui64 #endif diff --git a/lib/expr/exparse.y b/lib/expr/exparse.y index 02d45fea1..39159cee2 100644 --- a/lib/expr/exparse.y +++ b/lib/expr/exparse.y @@ -20,7 +20,7 @@ * expression library grammar and compiler */ -#ifdef WIN32 +#ifdef _WIN32 #include #ifdef GVDLL diff --git a/lib/expr/expr.vcxproj b/lib/expr/expr.vcxproj index 4b17d282c..9e44cdccc 100644 --- a/lib/expr/expr.vcxproj +++ b/lib/expr/expr.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -74,7 +74,7 @@ del exparse-intermediate.h $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/fdpgen/gvfdpgen.vcxproj b/lib/fdpgen/gvfdpgen.vcxproj index 589ce914f..db47df840 100644 --- a/lib/fdpgen/gvfdpgen.vcxproj +++ b/lib/fdpgen/gvfdpgen.vcxproj @@ -52,7 +52,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/fdpgen/tlayout.c b/lib/fdpgen/tlayout.c index 7a1a0110d..444711dd1 100644 --- a/lib/fdpgen/tlayout.c +++ b/lib/fdpgen/tlayout.c @@ -35,7 +35,7 @@ #endif #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #include @@ -537,7 +537,7 @@ static pointf initPositions(graph_t * g, bport_t * pp) if (T_smode == INIT_RANDOM) local_seed = T_seed; else { -#if defined(MSWIN32) || defined(WIN32) +#if defined(MSWIN32) || defined(_WIN32) local_seed = time(NULL); #else local_seed = getpid() ^ time(NULL); diff --git a/lib/glcomp/glcomp.vcxproj b/lib/glcomp/glcomp.vcxproj index 67821e3e8..2f5e9d707 100644 --- a/lib/glcomp/glcomp.vcxproj +++ b/lib/glcomp/glcomp.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\dependencies\freeglut\include;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtk-2.0\;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)lib\common;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\atk-1.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include\cairo;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + _DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(SolutionDir)windows\dependencies\freeglut\include;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtk-2.0\;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)lib\common;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\atk-1.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include\cairo;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/glcomp/glcompdefs.h b/lib/glcomp/glcompdefs.h index 841797604..cb7edab49 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 @@ -28,7 +28,7 @@ #include #include #include -#ifdef WIN32 +#ifdef _WIN32 #define strdup _strdup #endif diff --git a/lib/glcomp/glcompfont.h b/lib/glcomp/glcompfont.h index 6f5d0bc96..e79958b9a 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 092728d29..a1ecb3bbd 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 4e0cbe17d..a31288d0e 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 93ed697bd..a6d31d7c1 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.vcxproj b/lib/gvc.vcxproj index 6aa30f409..a01133805 100644 --- a/lib/gvc.vcxproj +++ b/lib/gvc.vcxproj @@ -88,7 +88,7 @@ copy $(SolutionDir)windows\dependencies\GTK2\bin\zlib1.dll $(OutDir)zlib1.dll $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\rxspencer\include\rxspencer;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)windows\dependencies\libtool\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/gvc/gvc.h b/lib/gvc/gvc.h index 3c9cb91af..894683a2d 100644 --- a/lib/gvc/gvc.h +++ b/lib/gvc/gvc.h @@ -28,7 +28,7 @@ extern "C" { #endif /*visual studio*/ -#ifdef WIN32 +#ifdef _WIN32 #ifndef GVC_EXPORTS #undef extern #define extern __declspec(dllimport) diff --git a/lib/gvc/gvcext.h b/lib/gvc/gvcext.h index 26bda1d45..e24fcad89 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 +#ifdef _WIN32 #ifndef GVC_EXPORTS __declspec(dllimport) lt_symlist_t lt_preloaded_symbols[]; #else @@ -77,7 +77,7 @@ lt_symlist_t lt_preloaded_symbols[]; /*end visual studio*/ -#ifndef WIN32 +#ifndef _WIN32 #if defined(GVDLL) __declspec(dllexport) lt_symlist_t lt_preloaded_symbols[]; #else diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h index 510819e94..30e3ea1de 100644 --- a/lib/gvc/gvcint.h +++ b/lib/gvc/gvcint.h @@ -146,7 +146,7 @@ extern "C" { extern GVC_t* gvCloneGVC (GVC_t *); extern void gvFreeCloneGVC (GVC_t *); -#ifdef WIN32 +#ifdef _WIN32 #define DIRSEP "\\" #else #define DIRSEP "/" diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c index 99c6569ff..fe6fee880 100644 --- a/lib/gvc/gvconfig.c +++ b/lib/gvc/gvconfig.c @@ -20,7 +20,7 @@ #ifdef ENABLE_LTDL #include -#ifdef WIN32 +#ifdef _WIN32 #include #define GLOB_NOSPACE 1 /* Ran out of memory. */ #define GLOB_ABORTED 2 /* Read error. */ @@ -271,7 +271,7 @@ char * gvconfig_libdir(GVC_t * gvc) if (!libdir) { libdir=getenv("GVBINDIR"); if (!libdir) { -#ifdef WIN32 +#ifdef _WIN32 int r; char* s; @@ -370,7 +370,7 @@ static void config_rescan(GVC_t *gvc, char *config_path) int i, rc, re_status; gvplugin_library_t *library; regex_t re; -#ifndef WIN32 +#ifndef _WIN32 char *plugin_glob = "libgvplugin_*"; #endif #if defined(DARWIN_DYLIB) @@ -384,7 +384,7 @@ static void config_rescan(GVC_t *gvc, char *config_path) plugin_glob = "cyggvplugin_*"; char *plugin_re_beg = "[^0-9]-"; char *plugin_re_end = "\\.dll$"; -#elif defined(WIN32) +#elif defined(_WIN32) char *plugin_glob = "gvplugin_*"; char *plugin_re_beg = "[^0-9]"; char *plugin_re_end = "\\.dll$"; @@ -415,7 +415,7 @@ static void config_rescan(GVC_t *gvc, char *config_path) config_re = gmalloc(strlen(plugin_re_beg) + 20 + strlen(plugin_re_end) + 1); -#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) +#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) sprintf(config_re,"%s%s", plugin_re_beg, plugin_re_end); #elif defined(GVPLUGIN_VERSION) sprintf(config_re,"%s%d%s", plugin_re_beg, GVPLUGIN_VERSION, plugin_re_end); @@ -434,7 +434,7 @@ static void config_rescan(GVC_t *gvc, char *config_path) /* load all libraries even if can't save config */ -#if defined(WIN32) +#if defined(_WIN32) rc = glob(gvc, config_glob, GLOB_NOSORT, NULL, &globbuf); #else rc = glob(config_glob, GLOB_NOSORT, NULL, &globbuf); @@ -563,7 +563,7 @@ void gvconfig(GVC_t * gvc, boolean rescan) } #ifdef ENABLE_LTDL -#ifdef WIN32 +#ifdef _WIN32 /* Emulating windows glob */ diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c index 4114a97a8..90366a49e 100644 --- a/lib/gvc/gvdevice.c +++ b/lib/gvc/gvdevice.c @@ -26,7 +26,7 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #include #include "compat.h" @@ -152,7 +152,7 @@ int gvdevice_initialize(GVJ_t * job) #ifdef HAVE_SETMODE #ifdef O_BINARY if (job->flags & GVDEVICE_BINARY_FORMAT) -#ifdef WIN32 +#ifdef _WIN32 _setmode(fileno(job->output_file), O_BINARY); #else setmode(fileno(job->output_file), O_BINARY); diff --git a/lib/gvc/gvio.h b/lib/gvc/gvio.h index b6d125831..0abc6c43b 100644 --- a/lib/gvc/gvio.h +++ b/lib/gvc/gvio.h @@ -27,7 +27,7 @@ extern "C" { #endif /*visual studio*/ -#ifdef WIN32 +#ifdef _WIN32 #ifndef GVC_EXPORTS #undef extern #define extern __declspec(dllimport) diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c index a69c8418c..f32805063 100644 --- a/lib/gvc/gvplugin.c +++ b/lib/gvc/gvplugin.c @@ -33,7 +33,7 @@ extern int strcasecmp(const char *s1, const char *s2); #endif -#ifdef WIN32 +#ifdef _WIN32 #define strdup(x) _strdup(x) #endif @@ -171,7 +171,7 @@ gvplugin_library_t *gvplugin_library_load(GVC_t * gvc, char *path) else p = gmalloc(lenp); } -#ifdef WIN32 +#ifdef _WIN32 if (path[1] == ':') { #else if (path[0] == '/') { @@ -197,7 +197,7 @@ gvplugin_library_t *gvplugin_library_load(GVC_t * gvc, char *path) s = strrchr(p, DIRSEP[0]); len = strlen(s); -#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) +#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) if (len < strlen("/gvplugin_x")) { #else if (len < strlen("/libgvplugin_x")) { @@ -206,7 +206,7 @@ gvplugin_library_t *gvplugin_library_load(GVC_t * gvc, char *path) return NULL; } sym = gmalloc(len + strlen(suffix) + 1); -#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) +#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) strcpy(sym, s + 1); /* strip leading "/" */ #else strcpy(sym, s + 4); /* strip leading "/lib" or "/cyg" */ diff --git a/lib/gvc/gvplugin_loadimage.h b/lib/gvc/gvplugin_loadimage.h index 8a9772780..a524b984a 100644 --- a/lib/gvc/gvplugin_loadimage.h +++ b/lib/gvc/gvplugin_loadimage.h @@ -27,7 +27,7 @@ extern "C" { #endif /*visual studio*/ -#ifdef WIN32 +#ifdef _WIN32 #ifndef GVC_EXPORTS #define extern __declspec(dllimport) #endif diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c index 3476c230b..c793b4b2c 100644 --- a/lib/gvc/gvusershape.c +++ b/lib/gvc/gvusershape.c @@ -19,7 +19,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #define GLOB_NOSPACE 1 /* Ran out of memory. */ #define GLOB_ABORTED 2 /* Read error. */ @@ -597,7 +597,7 @@ boolean gvusershape_file_access(usershape_t *us) agerr(AGWARN, "Filename \"%s\" is unsafe\n", us->name); return FALSE; } -#ifndef WIN32 +#ifndef _WIN32 us->f = fopen(fn, "r"); #else us->f = fopen(fn, "rb"); diff --git a/lib/gvpr/actions.c b/lib/gvpr/actions.c index 77dd75411..78ede2e1b 100644 --- a/lib/gvpr/actions.c +++ b/lib/gvpr/actions.c @@ -813,7 +813,7 @@ char *canon(Expr_t * pgm, char *arg) } #include -#ifdef WIN32 +#ifdef _WIN32 #include "compat.h" #endif @@ -1340,7 +1340,7 @@ char *colorx (Expr_t* ex, char* incolor, char* fmt, Sfio_t* fp) return exstring(ex, sfstruse(fp)); } -#ifndef WIN32 +#ifndef _WIN32 #include #include diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c index 01b0d25ff..4a8373958 100644 --- a/lib/gvpr/compile.c +++ b/lib/gvpr/compile.c @@ -67,7 +67,7 @@ static int ioflush(void *chan) static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush }; -#ifdef WIN32 +#ifdef _WIN32 static Agdisc_t gprDisc = { 0, 0, &gprIoDisc }; #else static Agdisc_t gprDisc = { &AgMemDisc, &AgIdDisc, &gprIoDisc }; @@ -2592,7 +2592,7 @@ Agraph_t *readG(Sfio_t * fp) { Agraph_t *g; -#ifdef WIN32 +#ifdef _WIN32 gprDisc.mem = &AgMemDisc; gprDisc.id = &AgIdDisc; #endif @@ -2612,7 +2612,7 @@ Agraph_t *openG(char *name, Agdesc_t desc) { Agraph_t *g; -#ifdef WIN32 +#ifdef _WIN32 gprDisc.mem = &AgMemDisc; gprDisc.id = &AgIdDisc; #endif diff --git a/lib/gvpr/gprstate.c b/lib/gvpr/gprstate.c index 03fe10912..0a0281981 100644 --- a/lib/gvpr/gprstate.c +++ b/lib/gvpr/gprstate.c @@ -17,7 +17,7 @@ * */ -#ifdef WIN32 +#ifdef _WIN32 #include "windows.h" #include "shlwapi.h" #endif diff --git a/lib/gvpr/gprstate.h b/lib/gvpr/gprstate.h index 9ad84434e..6f6ef06bb 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 +#ifdef _WIN32 extern int pathisrelative (char* path); #endif diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c index 00c721c96..be156f7b7 100644 --- a/lib/gvpr/gvpr.c +++ b/lib/gvpr/gvpr.c @@ -179,7 +179,7 @@ static int parseArgs(char *s, int argc, char ***argv) } -#ifdef WIN32 +#ifdef _WIN32 #define PATHSEP '\\' #define LISTSEP ';' #else diff --git a/lib/gvpr/gvprlib.vcxproj b/lib/gvpr/gvprlib.vcxproj index d8415242b..615367720 100644 --- a/lib/gvpr/gvprlib.vcxproj +++ b/lib/gvpr/gvprlib.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\expr;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -71,7 +71,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\expr;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;_LIB;GVDLL;%(PreprocessorDefinitions) + _LIB;GVDLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/ingraphs/ingraphs.vcxproj b/lib/ingraphs/ingraphs.vcxproj index c27014ff8..cd07d80a3 100644 --- a/lib/ingraphs/ingraphs.vcxproj +++ b/lib/ingraphs/ingraphs.vcxproj @@ -50,7 +50,7 @@ Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -65,7 +65,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/mingle/minglelib.vcxproj b/lib/mingle/minglelib.vcxproj index fbbb5b952..b16ab5ffb 100644 --- a/lib/mingle/minglelib.vcxproj +++ b/lib/mingle/minglelib.vcxproj @@ -55,7 +55,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\ANN;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ MaxSpeed true $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\ANN;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/lib/neatogen/gvneatogen.vcxproj b/lib/neatogen/gvneatogen.vcxproj index 3d46c8a33..80dfa2907 100644 --- a/lib/neatogen/gvneatogen.vcxproj +++ b/lib/neatogen/gvneatogen.vcxproj @@ -53,7 +53,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc - WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c index 61c53b347..a569b4877 100644 --- a/lib/neatogen/neatoinit.c +++ b/lib/neatogen/neatoinit.c @@ -15,7 +15,7 @@ #include "config.h" #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #include @@ -981,7 +981,7 @@ setSeed (graph_t * G, int dflt, long* seedp) long seed; /* Check for seed value */ if (!isdigit(*(unsigned char *)p) || sscanf(p, "%ld", &seed) < 1) { -#if defined(MSWIN32) || defined(WIN32) +#if defined(MSWIN32) || defined(_WIN32) seed = (unsigned) time(NULL); #else seed = (unsigned) getpid() ^ (unsigned) time(NULL); diff --git a/lib/neatogen/quad_prog_vpsc.c b/lib/neatogen/quad_prog_vpsc.c index 3621e6c52..ff63ec9ec 100644 --- a/lib/neatogen/quad_prog_vpsc.c +++ b/lib/neatogen/quad_prog_vpsc.c @@ -383,7 +383,7 @@ void generateNonoverlapConstraints(CMajEnvVPSC * e, Constraint **csol, **csolptr; int i, j, mol = 0; int n = e->nv + e->nldv; -#ifdef WIN32 +#ifdef _WIN32 boxf* bb = N_GNEW (n, boxf); #else boxf bb[n]; @@ -414,7 +414,7 @@ void generateNonoverlapConstraints(CMajEnvVPSC * e, opt->gap.y / 2.0; } if (genclusters) { -#ifdef WIN32 +#ifdef _WIN32 Constraint ***cscl = N_GNEW(opt->clusters->nclusters + 1, Constraint**); int* cm = N_GNEW(opt->clusters->nclusters + 1, int); #else @@ -423,7 +423,7 @@ void generateNonoverlapConstraints(CMajEnvVPSC * e, #endif for (i = 0; i < opt->clusters->nclusters; i++) { int cn = opt->clusters->clustersizes[i]; -#ifdef WIN32 +#ifdef _WIN32 Variable** cvs = N_GNEW(cn + 2, Variable*); boxf* cbb = N_GNEW(cn + 2, boxf); #else @@ -457,7 +457,7 @@ void generateNonoverlapConstraints(CMajEnvVPSC * e, cm[i] = genYConstraints(cn + 2, cbb, cvs, &cscl[i]); } mol += cm[i]; -#ifdef WIN32 +#ifdef _WIN32 free (cvs); free (cbb); #endif @@ -465,7 +465,7 @@ void generateNonoverlapConstraints(CMajEnvVPSC * e, /* generate top level constraints */ { int cn = opt->clusters->ntoplevel + opt->clusters->nclusters; -#ifdef WIN32 +#ifdef _WIN32 Variable** cvs = N_GNEW(cn,Variable*); boxf* cbb = N_GNEW(cn, boxf); #else @@ -533,7 +533,7 @@ void generateNonoverlapConstraints(CMajEnvVPSC * e, deleteVariable(cvs[i]); } mol += cm[opt->clusters->nclusters]; -#ifdef WIN32 +#ifdef _WIN32 free (cvs); free (cbb); #endif @@ -546,7 +546,7 @@ void generateNonoverlapConstraints(CMajEnvVPSC * e, } deleteConstraints(0, cscl[i]); } -#ifdef WIN32 +#ifdef _WIN32 free (cscl); free (cm); #endif @@ -603,7 +603,7 @@ void generateNonoverlapConstraints(CMajEnvVPSC * e, e->m); } #endif -#ifdef WIN32 +#ifdef _WIN32 free (bb); #endif } diff --git a/lib/neatogen/stuff.c b/lib/neatogen/stuff.c index 483c14c3a..c71495d6f 100644 --- a/lib/neatogen/stuff.c +++ b/lib/neatogen/stuff.c @@ -17,7 +17,7 @@ #include "neato.h" #include "stress.h" #include -#ifndef WIN32 +#ifndef _WIN32 #include #endif diff --git a/lib/ortho/gvortho.vcxproj b/lib/ortho/gvortho.vcxproj index 75721311e..16d76e8eb 100644 --- a/lib/ortho/gvortho.vcxproj +++ b/lib/ortho/gvortho.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/ortho/partition.c b/lib/ortho/partition.c index ffe1159cf..7cf548074 100644 --- a/lib/ortho/partition.c +++ b/lib/ortho/partition.c @@ -41,7 +41,7 @@ #ifndef HAVE_SRAND48 #define srand48 srand #endif -#ifdef WIN32 +#ifdef _WIN32 extern double drand48(void); #endif diff --git a/lib/osage/osage.vcxproj b/lib/osage/osage.vcxproj index 42e089d60..e071e30fc 100644 --- a/lib/osage/osage.vcxproj +++ b/lib/osage/osage.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/pack/pack.h b/lib/pack/pack.h index eba152fc1..fd29f4e68 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 +#ifdef _WIN32 #ifndef GVC_EXPORTS #define extern __declspec(dllimport) #endif diff --git a/lib/patchwork/gvpatchwork.vcxproj b/lib/patchwork/gvpatchwork.vcxproj index 056cac7fa..a06b77309 100644 --- a/lib/patchwork/gvpatchwork.vcxproj +++ b/lib/patchwork/gvpatchwork.vcxproj @@ -53,7 +53,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/pathplan/Pathplan.vcxproj b/lib/pathplan/Pathplan.vcxproj index 8413d34c3..c982ec020 100644 --- a/lib/pathplan/Pathplan.vcxproj +++ b/lib/pathplan/Pathplan.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -73,7 +73,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/rbtree/rbtree.vcxproj b/lib/rbtree/rbtree.vcxproj index 3b7f2efa3..1031e4df1 100644 --- a/lib/rbtree/rbtree.vcxproj +++ b/lib/rbtree/rbtree.vcxproj @@ -51,7 +51,7 @@ Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -66,7 +66,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/sfdpgen/sfdp.vcxproj b/lib/sfdpgen/sfdp.vcxproj index 2780fe308..ed0a388e0 100644 --- a/lib/sfdpgen/sfdp.vcxproj +++ b/lib/sfdpgen/sfdp.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/sfio/sfexit.c b/lib/sfio/sfexit.c index 33cc4639d..278aaa840 100644 --- a/lib/sfio/sfexit.c +++ b/lib/sfio/sfexit.c @@ -33,7 +33,7 @@ typedef struct _wait_ { static Waitpid_t *Wait; -#ifndef WIN32 +#ifndef _WIN32 waitpid(int pid, int *status, int options) { int id, ps; diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h index 4140eab8b..fe0f87814 100644 --- a/lib/sfio/sfhdr.h +++ b/lib/sfio/sfhdr.h @@ -781,13 +781,13 @@ extern "C" { /* for portable encoding of double values */ #if !__STDC__ -#ifndef WIN32 +#ifndef _WIN32 extern double frexp(double, int *); extern double ldexp(double, int); #endif #endif -#ifdef WIN32 +#ifdef _WIN32 #undef SF_ERROR #include #define SF_ERROR 0000400 /* an error happened */ @@ -813,11 +813,11 @@ extern "C" { #endif #endif /*HAVE_UNISTD_H*/ -#endif /* WIN32 */ +#endif /* _WIN32 */ extern time_t time(time_t *); extern int waitpid(int, int *, int); -#ifndef WIN32 +#ifndef _WIN32 extern void _exit(int); #endif typedef int (*Onexit_f)(void); diff --git a/lib/sfio/sfio.vcxproj b/lib/sfio/sfio.vcxproj index e0c2d8864..8235dca81 100644 --- a/lib/sfio/sfio.vcxproj +++ b/lib/sfio/sfio.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/sfio/sfmode.c b/lib/sfio/sfmode.c index c04e27e37..aafe61f50 100644 --- a/lib/sfio/sfmode.c +++ b/lib/sfio/sfmode.c @@ -227,7 +227,7 @@ int _sfpclose(reg Sfio_t * f) CLOSE(p->file); /* wait for process termination */ -#ifndef WIN32 +#ifndef _WIN32 while ((pid = waitpid(p->pid, &status, 0)) == -1 && errno == EINTR); #endif diff --git a/lib/sfio/sfopen.c b/lib/sfio/sfopen.c index 19b832371..17605c1c0 100644 --- a/lib/sfio/sfopen.c +++ b/lib/sfio/sfopen.c @@ -12,7 +12,7 @@ *************************************************************************/ #include "sfhdr.h" -#ifdef WIN32 +#ifdef _WIN32 #include "io.h" #endif @@ -38,7 +38,7 @@ Sfio_t *sfopen(reg Sfio_t * f, const char *file, const char *mode) /* usually used on the standard streams to change control flags */ -#ifndef WIN32 +#ifndef _WIN32 if (f && !file && (f->mode & SF_INIT)) { SFMTXSTART(f, NIL(Sfio_t *)); diff --git a/lib/sfio/sfpopen.c b/lib/sfio/sfpopen.c index 55810d7e7..ec616dd4d 100644 --- a/lib/sfio/sfpopen.c +++ b/lib/sfio/sfpopen.c @@ -114,7 +114,7 @@ static void execute(const char *argcmd) _exit(EXIT_NOTFOUND); } -#ifndef WIN32 +#ifndef _WIN32 /** * @param f * @param command command to execute diff --git a/lib/sparse/gvsparse.vcxproj b/lib/sparse/gvsparse.vcxproj index 956215914..48c17c8fb 100644 --- a/lib/sparse/gvsparse.vcxproj +++ b/lib/sparse/gvsparse.vcxproj @@ -52,7 +52,7 @@ Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/topfish/topfish.vcxproj b/lib/topfish/topfish.vcxproj index 9439f3e78..46094b358 100644 --- a/lib/topfish/topfish.vcxproj +++ b/lib/topfish/topfish.vcxproj @@ -51,7 +51,7 @@ Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -66,7 +66,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/twopigen/gvtwopigen.vcxproj b/lib/twopigen/gvtwopigen.vcxproj index 4faea2768..5f80778fb 100644 --- a/lib/twopigen/gvtwopigen.vcxproj +++ b/lib/twopigen/gvtwopigen.vcxproj @@ -53,7 +53,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/vmalloc/vmalloc.vcxproj b/lib/vmalloc/vmalloc.vcxproj index 1d80d104f..adb54d6d2 100644 --- a/lib/vmalloc/vmalloc.vcxproj +++ b/lib/vmalloc/vmalloc.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;MSWIN32;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;MSWIN32;%(PreprocessorDefinitions) false MultiThreaded diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h index 993aa8635..4c1f3c25e 100644 --- a/lib/vmalloc/vmhdr.h +++ b/lib/vmalloc/vmhdr.h @@ -20,7 +20,7 @@ extern "C" { #ifndef _BLD_vmalloc #define _BLD_vmalloc 1 #endif -#ifdef WIN32 +#ifdef _WIN32 #include #endif @@ -416,7 +416,7 @@ extern "C" { extern size_t getpagesize(void); -#ifndef WIN32 +#ifndef _WIN32 extern void abort(void); extern ssize_t write(int, const void *, size_t); #endif @@ -429,14 +429,14 @@ extern "C" { #include /* for malloc.c */ -#ifndef WIN32 +#ifndef _WIN32 extern int creat(const char *, int); extern int close(int); #endif extern int getpid(void); /* for vmexit.c */ -#ifndef WIN32 +#ifndef _WIN32 extern int onexit(void(*)(void)); extern void _exit(int); #endif diff --git a/lib/vpsc/csolve_VPSC.cpp b/lib/vpsc/csolve_VPSC.cpp index fe43eb8f5..077f06c0d 100644 --- a/lib/vpsc/csolve_VPSC.cpp +++ b/lib/vpsc/csolve_VPSC.cpp @@ -39,7 +39,7 @@ VPSC* newIncVPSC(int n, Variable* vs[], int m, Constraint* cs[]) { } int genXConstraints(int n, boxf* bb, Variable** vs, Constraint*** cs,int transitiveClosure) { -#ifdef WIN32 +#ifdef _WIN32 Rectangle** rs = new Rectangle* [n]; #else Rectangle* rs[n]; @@ -51,13 +51,13 @@ int genXConstraints(int n, boxf* bb, Variable** vs, Constraint*** cs,int transit for(int i=0;i Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -66,7 +66,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/xdot/xdot.h b/lib/xdot/xdot.h index b373caa95..fc9392e44 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 diff --git a/lib/xdot/xdot.vcxproj b/lib/xdot/xdot.vcxproj index bd266b62d..0abff472c 100644 --- a/lib/xdot/xdot.vcxproj +++ b/lib/xdot/xdot.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);%(AdditionalIncludeDirectories) - WIN32;EXPORT_XDOT;_DEBUG;_LIB;%(PreprocessorDefinitions) + EXPORT_XDOT;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -71,7 +71,7 @@ $(ProjectDir);%(AdditionalIncludeDirectories) - WIN32;EXPORT_XDOT;NDEBUG;_LIB;%(PreprocessorDefinitions) + EXPORT_XDOT;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/core/gvplugin_core.c b/plugin/core/gvplugin_core.c index 53d7866ff..9e9a61265 100644 --- a/plugin/core/gvplugin_core.c +++ b/plugin/core/gvplugin_core.c @@ -16,12 +16,12 @@ extern gvplugin_installed_t gvdevice_dot_types[]; extern gvplugin_installed_t gvdevice_fig_types[]; extern gvplugin_installed_t gvdevice_map_types[]; -#if !defined(WIN32) +#if !defined(_WIN32) extern gvplugin_installed_t gvdevice_mp_types[]; #endif extern gvplugin_installed_t gvdevice_ps_types[]; extern gvplugin_installed_t gvdevice_svg_types[]; -#if !defined(WIN32) +#if !defined(_WIN32) extern gvplugin_installed_t gvdevice_json_types[]; #endif extern gvplugin_installed_t gvdevice_tk_types[]; @@ -32,12 +32,12 @@ extern gvplugin_installed_t gvdevice_pov_types[]; extern gvplugin_installed_t gvrender_dot_types[]; extern gvplugin_installed_t gvrender_fig_types[]; extern gvplugin_installed_t gvrender_map_types[]; -#if !defined(WIN32) +#if !defined(_WIN32) extern gvplugin_installed_t gvrender_mp_types[]; #endif extern gvplugin_installed_t gvrender_ps_types[]; extern gvplugin_installed_t gvrender_svg_types[]; -#if !defined(WIN32) +#if !defined(_WIN32) extern gvplugin_installed_t gvrender_json_types[]; #endif extern gvplugin_installed_t gvrender_tk_types[]; @@ -54,12 +54,12 @@ static gvplugin_api_t apis[] = { {API_device, gvdevice_dot_types}, {API_device, gvdevice_fig_types}, {API_device, gvdevice_map_types}, -#if !defined(WIN32) +#if !defined(_WIN32) {API_device, gvdevice_mp_types}, #endif {API_device, gvdevice_ps_types}, {API_device, gvdevice_svg_types}, -#if !defined(WIN32) +#if !defined(_WIN32) {API_device, gvdevice_json_types}, #endif {API_device, gvdevice_tk_types}, @@ -70,12 +70,12 @@ static gvplugin_api_t apis[] = { {API_render, gvrender_dot_types}, {API_render, gvrender_fig_types}, {API_render, gvrender_map_types}, -#if !defined(WIN32) +#if !defined(_WIN32) {API_render, gvrender_mp_types}, #endif {API_render, gvrender_ps_types}, {API_render, gvrender_svg_types}, -#if !defined(WIN32) +#if !defined(_WIN32) {API_render, gvrender_json_types}, #endif {API_render, gvrender_tk_types}, diff --git a/plugin/core/gvplugin_core.vcxproj b/plugin/core/gvplugin_core.vcxproj index 139ce1d83..29e30d08b 100644 --- a/plugin/core/gvplugin_core.vcxproj +++ b/plugin/core/gvplugin_core.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c index d619ef15d..f086278f2 100644 --- a/plugin/core/gvrender_core_dot.c +++ b/plugin/core/gvrender_core_dot.c @@ -13,7 +13,7 @@ #include "config.h" -#ifdef WIN32 +#ifdef _WIN32 #include #include "compat.h" #endif diff --git a/plugin/core/gvrender_core_fig.c b/plugin/core/gvrender_core_fig.c index 328b64837..b01b7b524 100644 --- a/plugin/core/gvrender_core_fig.c +++ b/plugin/core/gvrender_core_fig.c @@ -18,7 +18,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #include "compat.h" #endif diff --git a/plugin/core/gvrender_core_hpgl.c b/plugin/core/gvrender_core_hpgl.c index 90d7377d5..f0ce48f51 100644 --- a/plugin/core/gvrender_core_hpgl.c +++ b/plugin/core/gvrender_core_hpgl.c @@ -20,7 +20,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #include "compat.h" #endif diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c index 4ac49081a..8c0bbe4d2 100644 --- a/plugin/core/gvrender_core_json.c +++ b/plugin/core/gvrender_core_json.c @@ -13,7 +13,7 @@ #include "config.h" -#ifdef WIN32 +#ifdef _WIN32 #include #include "compat.h" #endif diff --git a/plugin/core/gvrender_core_mp.c b/plugin/core/gvrender_core_mp.c index 96a37427e..d027d9980 100644 --- a/plugin/core/gvrender_core_mp.c +++ b/plugin/core/gvrender_core_mp.c @@ -20,7 +20,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #include "compat.h" #endif diff --git a/plugin/core/gvrender_core_vtx.c b/plugin/core/gvrender_core_vtx.c index 432e62323..610630786 100644 --- a/plugin/core/gvrender_core_vtx.c +++ b/plugin/core/gvrender_core_vtx.c @@ -20,7 +20,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #include "compat.h" #endif diff --git a/plugin/dot_layout/gvplugin_dot_layout.vcxproj b/plugin/dot_layout/gvplugin_dot_layout.vcxproj index 85f3bed4e..1014aad96 100644 --- a/plugin/dot_layout/gvplugin_dot_layout.vcxproj +++ b/plugin/dot_layout/gvplugin_dot_layout.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/gd/gvplugin_gd.vcxproj b/plugin/gd/gvplugin_gd.vcxproj index 10f39bddc..6d1f186d0 100644 --- a/plugin/gd/gvplugin_gd.vcxproj +++ b/plugin/gd/gvplugin_gd.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\libgd\src;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -85,7 +85,7 @@ copy $(SolutionDir)windows\dependencies\GTK2\bin\iconv.dll $(OutDir)iconv.dll $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\libgd\src;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions) MultiThreadedDLL Level4 diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c index e230dd8d2..858d7f44a 100644 --- a/plugin/gd/gvrender_gd.c +++ b/plugin/gd/gvrender_gd.c @@ -13,7 +13,7 @@ #include "config.h" -#ifdef WIN32 +#ifdef _WIN32 #include #endif #include diff --git a/plugin/gdiplus/gvplugin_gdiplus.vcxproj b/plugin/gdiplus/gvplugin_gdiplus.vcxproj index 77c18db5c..de9372206 100644 --- a/plugin/gdiplus/gvplugin_gdiplus.vcxproj +++ b/plugin/gdiplus/gvplugin_gdiplus.vcxproj @@ -54,7 +54,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/gdk/gvloadimage_gdk.c b/plugin/gdk/gvloadimage_gdk.c index 4855e4670..343a6c251 100644 --- a/plugin/gdk/gvloadimage_gdk.c +++ b/plugin/gdk/gvloadimage_gdk.c @@ -23,7 +23,7 @@ #include #include -#ifdef WIN32 //*dependencies +#ifdef _WIN32 //*dependencies #pragma comment( lib, "gvc.lib" ) #pragma comment( lib, "glib-2.0.lib" ) #pragma comment( lib, "cairo.lib" ) diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c index 83eee38ce..0fee65f07 100644 --- a/plugin/gs/gvloadimage_gs.c +++ b/plugin/gs/gvloadimage_gs.c @@ -43,7 +43,7 @@ #define e_invalidid gs_error_invalidid #endif -#ifdef WIN32 +#ifdef _WIN32 #define NUL_FILE "nul" #else #define NUL_FILE "/dev/null" diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcxproj b/plugin/neato_layout/gvplugin_neato_layout.vcxproj index 54e7b6920..9e63b6713 100644 --- a/plugin/neato_layout/gvplugin_neato_layout.vcxproj +++ b/plugin/neato_layout/gvplugin_neato_layout.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/pango/gvgetfontlist_pango.c b/plugin/pango/gvgetfontlist_pango.c index 1ea31e203..d03bc738c 100644 --- a/plugin/pango/gvgetfontlist_pango.c +++ b/plugin/pango/gvgetfontlist_pango.c @@ -529,7 +529,7 @@ gv_font_map* get_font_mapping(PangoFontMap * fontmap) gv_flist_free_af(gv_af_p); agxbfree(&xb); agxbfree(&xb2); -#ifndef WIN32 +#ifndef _WIN32 if (Verbose > 1) { fprintf(stderr, "Verbose %d\n", Verbose); printFontMap (gv_fmap, ps_fontnames_sz); diff --git a/plugin/pango/gvplugin_pango.vcxproj b/plugin/pango/gvplugin_pango.vcxproj index b6efc5ebf..deb5767fa 100644 --- a/plugin/pango/gvplugin_pango.vcxproj +++ b/plugin/pango/gvplugin_pango.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib/neatogen;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -94,7 +94,7 @@ $(SolutionDir)windows\dependencies\GTK2\bin\pango-querymodules.exe > $(OutDir $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib/neatogen;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c index d620b2997..ff25a6a89 100644 --- a/plugin/pango/gvtextlayout_pango.c +++ b/plugin/pango/gvtextlayout_pango.c @@ -257,7 +257,7 @@ static boolean pango_textlayout(textspan_t * span, char **fontpath) span->size.y = (int)(span->font->size * 1.1 + .5); /* The y offset from baseline to 0,0 of the bitmap representation */ -#if !defined(WIN32) && defined PANGO_VERSION_MAJOR && (PANGO_VERSION_MAJOR >= 1) +#if !defined(_WIN32) && defined PANGO_VERSION_MAJOR && (PANGO_VERSION_MAJOR >= 1) span->yoffset_layout = pango_layout_get_baseline (layout) * textlayout_scale; #else { diff --git a/plugin/poppler/gvloadimage_poppler.c b/plugin/poppler/gvloadimage_poppler.c index e84797867..7fd349243 100644 --- a/plugin/poppler/gvloadimage_poppler.c +++ b/plugin/poppler/gvloadimage_poppler.c @@ -23,7 +23,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #define NUL_FILE "nul" #else #define NUL_FILE "/dev/null" diff --git a/plugin/rsvg/gvloadimage_rsvg.c b/plugin/rsvg/gvloadimage_rsvg.c index 69ecdf4b9..56ef22c35 100644 --- a/plugin/rsvg/gvloadimage_rsvg.c +++ b/plugin/rsvg/gvloadimage_rsvg.c @@ -26,7 +26,7 @@ #endif #include -#ifdef WIN32 +#ifdef _WIN32 #define NUL_FILE "nul" #else #define NUL_FILE "/dev/null" diff --git a/plugin/visio/gvplugin_visio.c b/plugin/visio/gvplugin_visio.c index b2c1a5d77..da2421e60 100644 --- a/plugin/visio/gvplugin_visio.c +++ b/plugin/visio/gvplugin_visio.c @@ -11,7 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef WIN32 //*dependencies +#ifdef _WIN32 //*dependencies #pragma comment( lib, "gvc.lib" ) #pragma comment( lib, "graph.lib" ) #endif diff --git a/plugin/webp/gvloadimage_webp.c b/plugin/webp/gvloadimage_webp.c index 55e0c2d50..5c8282905 100644 --- a/plugin/webp/gvloadimage_webp.c +++ b/plugin/webp/gvloadimage_webp.c @@ -24,7 +24,7 @@ #include #include -#ifdef WIN32 //*dependencies +#ifdef _WIN32 //*dependencies #pragma comment( lib, "gvc.lib" ) #pragma comment( lib, "glib-2.0.lib" ) #pragma comment( lib, "pango-1.0.lib" ) diff --git a/tclpkg/gdtclft/gdtclft.c b/tclpkg/gdtclft/gdtclft.c index 245e30c9c..e0b0d5bb2 100644 --- a/tclpkg/gdtclft/gdtclft.c +++ b/tclpkg/gdtclft/gdtclft.c @@ -23,7 +23,7 @@ #include #include "gd.h" -#ifdef WIN32 +#ifdef _WIN32 #include #endif diff --git a/windows/include/ps_font_equiv.h b/windows/include/ps_font_equiv.h index 712e3ba6f..acc8c0f17 100644 --- a/windows/include/ps_font_equiv.h +++ b/windows/include/ps_font_equiv.h @@ -1,6 +1,6 @@ #ifdef DARWIN #define TIMES "Times" -#elif defined(WIN32) +#elif defined(_WIN32) #define TIMES "Times New Roman" #else #define TIMES "Times" -- 2.40.0