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.

diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index 343513b0c7c444308ff338d627b4fe7e375010c1..04baa9eeaf1aa89f39869656ff76ee54733bb5f2 100644 (file)
--- 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 05cddd32d0db96a74353e6c0a75dc5ce8734132b..c3cb8d367a7f63e806ba9c39a04d8cf81f857a82 100644 (file)
--- a/cmd/dot/dot.vcxproj
+++ b/cmd/dot/dot.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/dotty/dotty.vcxproj b/cmd/dotty/dotty.vcxproj
index 98de7cf087db5c438c9b1ffc17db70479b032724..260c75c145327438a33abaa22b38e3fb6f14d24f 100644 (file)
--- a/cmd/dotty/dotty.vcxproj
+++ b/cmd/dotty/dotty.vcxproj
@@ -53,7 +53,7 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>
       </AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>
       </AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/edgepaint/edgepaint.vcxproj b/cmd/edgepaint/edgepaint.vcxproj
index 11bd67f7613d29bcd737a25c28e3c2605c49477a..b82bf252dd136cff678fe1ecb565a829b9d5f1ee 100644 (file)
--- a/cmd/edgepaint/edgepaint.vcxproj
+++ b/cmd/edgepaint/edgepaint.vcxproj
@@ -55,7 +55,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -78,7 +78,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />

diff --git a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp
index d362bca1b86c343e3bc9c08a338eff5c46c1227a..abd321b61768126ab76c43609bf2f96f303f2a82 100644 (file)
--- 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 2510c7697277a5828aee73dd822dd8c0484dc50c..bb4c2546b58d7e0cfac39066c5c648dd31f7772e 100644 (file)
--- 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 <stdio.h>
@@ -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 bd74b66ccacefd2738151de43ce64d282a33aa61..55e4d587fce320a61850fe0519e48a4f680ad689 100644 (file)
--- 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 67135d911e51cd133c4d4c8d43c7505b75bf5b5b..121d8175c68e858dd4987cdad55d5247e869738e 100644 (file)
--- 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 c240b8c85993a2e652bd5202a8def8ff323ca3d9..7566771b2ac7067477bb4515defb76b3a787a733 100644 (file)
--- a/cmd/gvmap/gvmap.vcxproj
+++ b/cmd/gvmap/gvmap.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -73,7 +73,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/gvpr/gvpr.vcxproj b/cmd/gvpr/gvpr.vcxproj
index edd4748e05f2971e3dea86ee9cc5eb8e58887871..59b691f180812948268798af7b8bbceab913c917 100644 (file)
--- a/cmd/gvpr/gvpr.vcxproj
+++ b/cmd/gvpr/gvpr.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\gvpr</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MSWIN32;WIN32;_DEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>MSWIN32;_DEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\gvpr</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/lefty/common.h b/cmd/lefty/common.h
index 7d34fd98170349c213aff6eac0b714835e5e6b48..b485943366cbf6a6d080d8a3ae1c5719c7d93db4 100644 (file)
--- 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 4e9dd6ca0cf48ceaa2e58ccd2ea1c890eb5b8711..cafe91f4723387b88ae6ebae230572f1ba151f3c 100644 (file)
--- a/cmd/lefty/lefty.vcxproj
+++ b/cmd/lefty/lefty.vcxproj
@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>TurnOffAllWarnings</WarningLevel>

diff --git a/cmd/lefty/tbl.h b/cmd/lefty/tbl.h
index 62f29537e2e26d85cff5531c01dc6875974cf28c..f97e3f849bb51b9f8b6536286955a4ea3d056a51 100644 (file)
--- 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 df77e66fe39a0ecf98f6c83269803d9314e3b505..554bf9fb325ae3cd60e614a4d533d51b5d286293 100644 (file)
--- a/cmd/lneato/lneato.vcxproj
+++ b/cmd/lneato/lneato.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -70,7 +70,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/mingle/mingle.vcxproj b/cmd/mingle/mingle.vcxproj
index 4626a076262310e0931bb0f561d694b3e76a8033..0c393f84bb8f56ac14a4ac640178e4f47c7a2f9d 100644 (file)
--- a/cmd/mingle/mingle.vcxproj
+++ b/cmd/mingle/mingle.vcxproj
@@ -55,7 +55,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -81,7 +81,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />

diff --git a/cmd/smyrna/btree.c b/cmd/smyrna/btree.c
index 396b7cb1ace2130a8ab744326ffc2f028388b6b9..ac62b51f59b205d2804e0874c11905a679068b4a 100644 (file)
--- 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 e83b7aaaacf5414ae8367b9d3efc8dd34bea8ce1..ac6d1493b16f57cf2b07ec8c2ea85129233accc7 100644 (file)
--- 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 ab19e0eef7ecc141b442f5b641bfebb7940c5cff..b2c9b5ff9590e0d8af38f06b36e732d1745e90ed 100755 (executable)
--- 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 390d062b75bdb026530feb0800f0e371b777e336..b64543a1586f51cd55d3711c9d37173a7b4707d6 100644 (file)
--- 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 <strings.h>

diff --git a/cmd/smyrna/gui/glcompui.c b/cmd/smyrna/gui/glcompui.c
index 53986e5920ecb42a97830f22bf297986ea5ce499..56f36e07b89c43ebe8f56e527c02dbdf0394b409 100644 (file)
--- 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 4096c0b3745fde3c622728b91d00d25a3edb6003..0dddc9b0f47d99b766869c8375b0de932f485623 100755 (executable)
--- 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 1266bb5b551139d94ee92e96ddd336978a697fc4..2ec072c33104b5ab106d9f4ecd087c82d551cc05 100755 (executable)
--- a/cmd/smyrna/gui/toolboxcallbacks.h
+++ b/cmd/smyrna/gui/toolboxcallbacks.h
@@ -15,7 +15,7 @@
 #define TOOLBOXCALLBACKS_H
 #include <gtk/gtk.h>
 #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 a3e6f6aa4113231ae5f20b0479e8cf8d667a993c..5f417ebf04d6e3f55e6e0e7cf26e2366006e50c9 100755 (executable)
--- 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 859b313cc12dfef3c76e74bf45abca23ec8cdf29..2c96d6fc180fc3e5bc66b54b33e4ae9d90ffe4c5 100644 (file)
--- 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 aaae58905c5d80610376fedfb154a234dbb9d29f..25937141540fb0211c2d8a8acbf6e71e86585de5 100644 (file)
--- a/cmd/smyrna/smyrna.vcxproj
+++ b/cmd/smyrna/smyrna.vcxproj
@@ -53,7 +53,7 @@
       <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -102,7 +102,7 @@ $(SolutionDir)windows\dependencies\GTK2\bin\pango-querymodules.exe &gt; $(OutDir
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h
index 1e86d8466cc4b244acf50e64d3c31fb2917967c2..0106af2f2c0b86a94609987441fc9f59b2412e46 100644 (file)
--- 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 687c9eaa1b2522d70d6f5993ac9617d23248631c..597c2bce24a1e12058f5e0923e74efa115c105a4 100644 (file)
--- a/cmd/tools/acyclic.vcxproj
+++ b/cmd/tools/acyclic.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/bcomps.vcxproj b/cmd/tools/bcomps.vcxproj
index 0d0eb456baaf5a549a633ab21ffa8f01a94201c0..64cac762536a2c848133fdd9084cceeb213594b5 100644 (file)
--- a/cmd/tools/bcomps.vcxproj
+++ b/cmd/tools/bcomps.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/ccomps.vcxproj b/cmd/tools/ccomps.vcxproj
index b4c5a32357c3bc61f8c784491bf58894f732cfbb..82f467bf7236d7b26c67d4c40e5c055f6db2a683 100644 (file)
--- a/cmd/tools/ccomps.vcxproj
+++ b/cmd/tools/ccomps.vcxproj
@@ -53,7 +53,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/convert.h b/cmd/tools/convert.h
index 17731bd58cc45fa8ca7cee00ce4e1d5a48df83d7..da2bd74d1f82dc3389110e1a1971855ee4ff6881 100644 (file)
--- 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 1c58de0cef9e70a3318227a14faaa15bbdc221db..bf917ce6d43ceabfa589fb3d0f6e3569406b04f1 100644 (file)
--- a/cmd/tools/dijkstra.vcxproj
+++ b/cmd/tools/dijkstra.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/gc.vcxproj b/cmd/tools/gc.vcxproj
index 95e12f3d4131aecc47b003e39a7c89db087f311a..b41efde23e6d9dd802e22d57cf3a31cb0a8af608 100644 (file)
--- a/cmd/tools/gc.vcxproj
+++ b/cmd/tools/gc.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/gml2gv.h b/cmd/tools/gml2gv.h
index dcc9d85566ae5feefcb43984705e2c0c8b91d1ec..7b796db777ca994d7c2a0993a86f1042fadc4d7b 100644 (file)
--- a/cmd/tools/gml2gv.h
+++ b/cmd/tools/gml2gv.h
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <cgraph.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #define strdup(x) _strdup(x)
 #endif
 

diff --git a/cmd/tools/gml2gv.vcxproj b/cmd/tools/gml2gv.vcxproj
index 8a77ab63a309ec1c0b83f27fde6ea6341f7d5604..3c960ef553e1cee19b44e3b3ea4efebfb913f62d 100644 (file)
--- a/cmd/tools/gml2gv.vcxproj
+++ b/cmd/tools/gml2gv.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -85,7 +85,7 @@ del gmlparse-intermediate.c</Command>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/graphml2gv.vcxproj b/cmd/tools/graphml2gv.vcxproj
index cacd187fa5c9c4f34a213242a9fdd701ceb4f7af..d6cf1db5ba427c797fde3e48ca32d658454c0900 100644 (file)
--- a/cmd/tools/graphml2gv.vcxproj
+++ b/cmd/tools/graphml2gv.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/gv2gml.c b/cmd/tools/gv2gml.c
index 5d01c49851c3300949f8814f83a08678bfd32c4d..bc880555f902b5004b1169e020d000817e60566d 100644 (file)
--- 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 c2444144b4431e47fc541e3dec3395f807e855b3..cedbddc77598100e3e9797bc0324857ea780dcfd 100644 (file)
--- a/cmd/tools/gv2gml.vcxproj
+++ b/cmd/tools/gv2gml.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/gvcolor.vcxproj b/cmd/tools/gvcolor.vcxproj
index b61cf5682ecc91775f143127353d09b9254626ee..1cce25aaf513b612754b1f6c66b457e57aabcfd3 100644 (file)
--- a/cmd/tools/gvcolor.vcxproj
+++ b/cmd/tools/gvcolor.vcxproj
@@ -53,7 +53,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/gvgen.vcxproj b/cmd/tools/gvgen.vcxproj
index 1bb141cd1d9926911f135083afb7e43d18c6e245..de62cd70dfd11d4983305af64f3ab6244d3e59a8 100644 (file)
--- a/cmd/tools/gvgen.vcxproj
+++ b/cmd/tools/gvgen.vcxproj
@@ -50,7 +50,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -71,7 +71,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c
index e3ae8f824f7438ca893a210e50b60d506b4106c3..f3c73f6b03cb8f51388b6fe72063a5e0eb30d414 100644 (file)
--- 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 e3f25bf1488f5eb50921ae51aebce2ed085c63e6..f91bc94a9f15b5240feed50dd8bcd2163c3cc1df 100644 (file)
--- a/cmd/tools/gvpack.vcxproj
+++ b/cmd/tools/gvpack.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/gvpack_builtins.c b/cmd/tools/gvpack_builtins.c
index bcac04d3445cbc25e360cb5edabc9b004348c784..eb832908a5f0f51edea5ccad776029ecbec002cc 100644 (file)
--- 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 ec83e7b14960983835d5fa21995aed036d0ab739..935c15046f8de9ac913aa9401dd099005d63bec4 100644 (file)
--- a/cmd/tools/gxl2gv.vcxproj
+++ b/cmd/tools/gxl2gv.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;MSWIN32;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;MSWIN32;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -79,7 +79,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/mm2gv.vcxproj b/cmd/tools/mm2gv.vcxproj
index e0a956735a6392e9e37d3ee2806c4ccd3edc8713..e9c456211b164e87efd7f4a9aafe1245748d8db9 100644 (file)
--- a/cmd/tools/mm2gv.vcxproj
+++ b/cmd/tools/mm2gv.vcxproj
@@ -53,7 +53,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/nop.vcxproj b/cmd/tools/nop.vcxproj
index 825bc83d2c1277d0ad3198b0137aeb38a6acf402..f7ef8c4e55a7eb5c7a8415dd2037a380848b83e4 100644 (file)
--- a/cmd/tools/nop.vcxproj
+++ b/cmd/tools/nop.vcxproj
@@ -53,7 +53,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/sccmap.vcxproj b/cmd/tools/sccmap.vcxproj
index 8c928f68235b8d453172e101fa3224deb374ac8d..06022e05927baf5cee7633f6595f8ce7e7f17393 100644 (file)
--- a/cmd/tools/sccmap.vcxproj
+++ b/cmd/tools/sccmap.vcxproj
@@ -53,7 +53,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/tred.vcxproj b/cmd/tools/tred.vcxproj
index 87a8c83a9c63e3ec052b42bca2321777cf23b211..feeef415d33231c20947dea97d4efa5b7cc37619 100644 (file)
--- a/cmd/tools/tred.vcxproj
+++ b/cmd/tools/tred.vcxproj
@@ -53,7 +53,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/tools/tred2.c b/cmd/tools/tred2.c
index a11b4e22dec0912123599506bb0034c15985c06a..ccfd897cf1099700a07f9908a47f7ea6d2d83420 100644 (file)
--- 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 b6e843b6289d2bda672340eb4c1869332fc59b72..348b2d39298460e6d48d02266873f37da3d36df3 100644 (file)
--- a/cmd/tools/unflatten.vcxproj
+++ b/cmd/tools/unflatten.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
       <EnablePREfast>true</EnablePREfast>

diff --git a/configure.ac b/configure.ac
index 4973b3cdd28a9a9f5fea45c757663215054d574c..17a721c53dfd3d73707eda79cdf58928d99b3da3 100644 (file)
--- 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 c0a26d16329581953f4264f6e2358fd5c6f2be99..fc15e25e3b19facb6281f3e32db7334fbadfa651 100644 (file)
--- a/contrib/diffimg/diffimg.c
+++ b/contrib/diffimg/diffimg.c
@@ -30,11 +30,11 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifndef WIN32
+#ifndef _WIN32
 //#include <unistd.h>
 #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 fe16f1952ce99d52edfddb864095fbc3c0309228..a8133d4113f0bbd7e0c4e2e87c5ce72459c52b85 100644 (file)
--- a/contrib/diffimg/diffimg.vcxproj
+++ b/contrib/diffimg/diffimg.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libgd\src</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -77,7 +77,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libgd\src</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/contrib/prune/prune.c b/contrib/prune/prune.c
index 8219ba0c8df1d44fabd4c6b8b05f37e194974c4e..7df847fd47bd0be7e1a600114116278dd22b2a73 100644 (file)
--- a/contrib/prune/prune.c
+++ b/contrib/prune/prune.c
@@ -14,7 +14,7 @@
 #include "config.h"
 
 #include <stdio.h>
-#ifndef WIN32
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include <stdlib.h>

diff --git a/contrib/prune/prune.vcxproj b/contrib/prune/prune.vcxproj
index b4f69c37f9ed23c8dbe02fecfd7504f96e1af34b..ce0ccbdf1937c16ce38db1452c7a87e91c6b6844 100644 (file)
--- a/contrib/prune/prune.vcxproj
+++ b/contrib/prune/prune.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/doc/winbuild.html b/doc/winbuild.html
index 01aecbf4c1beff9d239efec7891359de04ba3a1e..ee98186d5d964284b39f64c6472e44faf78bd0b9 100644 (file)
--- a/doc/winbuild.html
+++ b/doc/winbuild.html
@@ -205,7 +205,7 @@ that produces Windows-compatible results.
 <PRE>
     case "$host_os" in
      mingw*)
-       DEFS="$DEFS -DWIN32 -DMSWIN32"
+       DEFS="$DEFS -DMSWIN32"
        ;;
      esac
 </PRE>

diff --git a/lib/ast/ast.vcxproj b/lib/ast/ast.vcxproj
index ff63959677b46319e7e755908999e56ee57a4047..51b1a3ca1dd8a553344deaca47d7c514e385c8c6 100644 (file)
--- a/lib/ast/ast.vcxproj
+++ b/lib/ast/ast.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\sfio</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -67,7 +67,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\sfio</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/cdt/cdt.vcxproj b/lib/cdt/cdt.vcxproj
index 158f789a6662169fb52824131b58a9bce08a2209..33a54c76494f2dc439f358aae82ab33211734866 100644 (file)
--- a/lib/cdt/cdt.vcxproj
+++ b/lib/cdt/cdt.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CDT_EXPORTS;WIN32_DLL;_BLD_cdt ;__EXPORT__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CDT_EXPORTS;WIN32_DLL;_BLD_cdt ;__EXPORT__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
@@ -72,7 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CDT_EXPORTS;WIN32_DLL;_BLD_cdt;__EXPORT__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CDT_EXPORTS;WIN32_DLL;_BLD_cdt;__EXPORT__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/cgraph/cgraph.vcxproj b/lib/cgraph/cgraph.vcxproj
index 51c187d3c6db7cf5ec837d61bdb6b55302fcff53..4d79ff05bbc273304e573488c78395521620275b 100644 (file)
--- a/lib/cgraph/cgraph.vcxproj
+++ b/lib/cgraph/cgraph.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;_DLL_BLD;_dll_import;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;_DLL_BLD;_dll_import;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -78,7 +78,7 @@ flex -oscan.c scan.l</Command>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/circogen/gvcircogen.vcxproj b/lib/circogen/gvcircogen.vcxproj
index 4164e91b0b1b02928e03c4c93290972437ddfedf..baa57d60101ff8bbd55ec06532eb5c439d9afe43 100644 (file)
--- a/lib/circogen/gvcircogen.vcxproj
+++ b/lib/circogen/gvcircogen.vcxproj
@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/dotgen/gvdotgen.vcxproj b/lib/dotgen/gvdotgen.vcxproj
index 7e7be8543ab8084bdcce67f0e9f46633ab331bd3..cea76d9e8783fcb3a3bac151cfd2f5ea76ea63ff 100644 (file)
--- a/lib/dotgen/gvdotgen.vcxproj
+++ b/lib/dotgen/gvdotgen.vcxproj
@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;_TEST_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;_TEST_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/edgepaint/edgepaintlib.vcxproj b/lib/edgepaint/edgepaintlib.vcxproj
index 0449f9c2979c319372ad5aa935aed6d8c207870a..ebb2c7c89115ce2518caee73a06384d6536fdef9 100644 (file)
--- a/lib/edgepaint/edgepaintlib.vcxproj
+++ b/lib/edgepaint/edgepaintlib.vcxproj
@@ -55,7 +55,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -72,7 +72,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />

diff --git a/lib/edgepaint/lab_gamut.h b/lib/edgepaint/lab_gamut.h
index 63f157ec6116eff8613acae759d38e9d8b6ea242..03393428aba33a23e72bc63bf3a5b7f8cdd919cb 100644 (file)
--- 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 e8d3ad1aeaa117dc4d72fd292b260a3a9a90c7fa..178008d63fdf3dd998ad40eb7d959d9311367d38 100644 (file)
--- a/lib/edgepaint/lab_gamut.vcxproj
+++ b/lib/edgepaint/lab_gamut.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)lib\edgepaint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)lib\edgepaint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;LAB_GAMUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/edgepaint/node_distinct_coloring.c b/lib/edgepaint/node_distinct_coloring.c
index b3d8295fa87d3cb16daeca8dc5c1e4f5bbab431a..9c5bb0325e65cffd8ea1eb6a674bb9ffdffc9a25 100644 (file)
--- 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 592e1f1ca066cb7185eebb4bfc5e56da60adc314..ce2d30cb1243b35bd44b62d148514ca192d6776a 100644 (file)
--- a/lib/expr/exeval.c
+++ b/lib/expr/exeval.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <assert.h>
 #include <time.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <stdlib.h>
 #define srand48 srand
 #define drand48 rand

diff --git a/lib/expr/exlib.h b/lib/expr/exlib.h
index 1ab24efa7037129374edd829f85a26d7df97363b..834224af88cebec6113915c88dbe00a1dfa642a7 100644 (file)
--- 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 02d45fea180da9f898eb2d082c48177d063c9b24..39159cee2d6dbafef1854bbe42a252d0109dd6a0 100644 (file)
--- a/lib/expr/exparse.y
+++ b/lib/expr/exparse.y
@@ -20,7 +20,7 @@
  * expression library grammar and compiler
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <config.h>
 
 #ifdef GVDLL

diff --git a/lib/expr/expr.vcxproj b/lib/expr/expr.vcxproj
index 4b17d282cbba78681d15e63d3469264aa7e54823..9e44cdccc8839932136de4f5df3c4440bcadbdaa 100644 (file)
--- a/lib/expr/expr.vcxproj
+++ b/lib/expr/expr.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@ del exparse-intermediate.h</Command>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/fdpgen/gvfdpgen.vcxproj b/lib/fdpgen/gvfdpgen.vcxproj
index 589ce914f5621a5061a89c0c651d7ed300f4587f..db47df840def33865d0dd8fe1b03019e31dc3c44 100644 (file)
--- a/lib/fdpgen/gvfdpgen.vcxproj
+++ b/lib/fdpgen/gvfdpgen.vcxproj
@@ -52,7 +52,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/fdpgen/tlayout.c b/lib/fdpgen/tlayout.c
index 7a1a0110db76caff0bec5fa2b8363cc2c36be434..444711dd194afca15a68a5f9b735d8e0cb4ff4a5 100644 (file)
--- a/lib/fdpgen/tlayout.c
+++ b/lib/fdpgen/tlayout.c
@@ -35,7 +35,7 @@
 #endif
 #include <stdlib.h>
 #include <time.h>
-#ifndef WIN32
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include <ctype.h>
@@ -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 67821e3e8925b8ab2514cba11d591a55c151a39e..2f5e9d70748a0bdd265418abd11cff320bce86a3 100644 (file)
--- a/lib/glcomp/glcomp.vcxproj
+++ b/lib/glcomp/glcomp.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -67,7 +67,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/glcomp/glcompdefs.h b/lib/glcomp/glcompdefs.h
index 8417976045e52e24c3ea2c934a1fda6ff326b733..cb7edab49eedc1eaf1be9f4ea0296311b30f86c5 100644 (file)
--- a/lib/glcomp/glcompdefs.h
+++ b/lib/glcomp/glcompdefs.h
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <math.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #include <winuser.h>
 #include <tchar.h>
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
-#ifdef WIN32
+#ifdef _WIN32
 #define strdup _strdup
 #endif
 

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

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

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

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

diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj
index 6aa30f409add5b915aa1961b85ae108cac291313..a01133805943e907008e55c5ec9d0baa5e779a64 100644 (file)
--- a/lib/gvc.vcxproj
+++ b/lib/gvc.vcxproj
@@ -88,7 +88,7 @@ copy $(SolutionDir)windows\dependencies\GTK2\bin\zlib1.dll $(OutDir)zlib1.dll</C
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/gvc/gvc.h b/lib/gvc/gvc.h
index 3c9cb91af71cd096e1861d1b61204366e7f74b96..894683a2d35dc16a5dfd523984a991da31a76a0d 100644 (file)
--- 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 26bda1d455bc9c0a9001f6427251b536e28c3c00..e24fcad897d2dd920be44117bedd95215925ff80 100644 (file)
--- a/lib/gvc/gvcext.h
+++ b/lib/gvc/gvcext.h
@@ -64,7 +64,7 @@ extern "C" {
     typedef struct gvplugin_available_s gvplugin_available_t;
 
 /*visual studio*/
-#ifdef WIN32
+#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 510819e94e64b0fe4b99e6d1a5fd003b8f77eeeb..30e3ea1deff403ebf209a60ab66b7fc971784ea3 100644 (file)
--- 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 99c6569ffee28548793a04d3109a7be8fb6aba51..fe6fee8808152156856de1263dab7e5587676021 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -20,7 +20,7 @@
 
 #ifdef ENABLE_LTDL
 #include       <sys/types.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #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 4114a97a87a52d1457b4e39a1586215abbe61698..90366a49e02ec9fa196783bb0ad1c60ab8925443 100644 (file)
--- a/lib/gvc/gvdevice.c
+++ b/lib/gvc/gvdevice.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <fcntl.h>
 #include <io.h>
 #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 b6d1258318c88dee2e592ff7d4c6547c12faa153..0abc6c43bc6fede1091fccf541371cb97b052186 100644 (file)
--- 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 a69c8418c06c8d9f085bcbe03945e143d86f8a01..f32805063cad06d5b500c15dc31743a522e2065f 100644 (file)
--- 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 8a97727809d1d791fc26945e235db6fddf1a5a49..a524b984aac26201e9adef5b7b6abb3dc010fbcf 100644 (file)
--- a/lib/gvc/gvplugin_loadimage.h
+++ b/lib/gvc/gvplugin_loadimage.h
@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 /*visual studio*/
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef GVC_EXPORTS
 #define extern __declspec(dllimport)
 #endif

diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c
index 3476c230bc97d008e591720523e5e4223515b0a1..c793b4b2ca61e67f52d6c139071459f19c8b214f 100644 (file)
--- a/lib/gvc/gvusershape.c
+++ b/lib/gvc/gvusershape.c
@@ -19,7 +19,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #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 77dd75411388ba52d36c181b13de60d46c4f31b9..78ede2e1b45ca7896ddc2796dfbc068e9cbd0734 100644 (file)
--- a/lib/gvpr/actions.c
+++ b/lib/gvpr/actions.c
@@ -813,7 +813,7 @@ char *canon(Expr_t * pgm, char *arg)
 }
 
 #include <stdlib.h>
-#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        <unistd.h>
 #include        <sys/types.h>

diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
index 01b0d25ff9bbfb2a1e09b4549511bbddb889a29b..4a8373958b8d4dff9c358d90ddb5bfc6bd14e812 100644 (file)
--- 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 03fe10912d6f87a3f7d20fcbbcb9988504af91c5..0a02819813c4bdda2c9d001211ea1b0f6a6293e7 100644 (file)
--- 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 9ad84434e2c0355b132d9bd31aeca0ca624f464c..6f6ef06bb5d42e4a9b055eaa777c4708a5e5082c 100644 (file)
--- a/lib/gvpr/gprstate.h
+++ b/lib/gvpr/gprstate.h
@@ -82,7 +82,7 @@ extern "C" {
     extern void initGPRState(Gpr_t *, Vmalloc_t *);
     extern int validTVT(int);
 
-#ifdef WIN32
+#ifdef _WIN32
     extern int pathisrelative (char* path);
 #endif
 

diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c
index 00c721c9691488061a6a40dbe47516274bbf5e05..be156f7b7cb67fa28ba03ccf9e304914fec27cde 100644 (file)
--- 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 d8415242b294aeb47e882f2b9309c532371b1441..6153677208815fb857de14da3779569c1ce83481 100644 (file)
--- a/lib/gvpr/gvprlib.vcxproj
+++ b/lib/gvpr/gvprlib.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_LIB;GVDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LIB;GVDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/ingraphs/ingraphs.vcxproj b/lib/ingraphs/ingraphs.vcxproj
index c27014ff8161a50d2844033e4846abcb29f7b72c..cd07d80a329f5f573cb780f75c55cdae702036e4 100644 (file)
--- a/lib/ingraphs/ingraphs.vcxproj
+++ b/lib/ingraphs/ingraphs.vcxproj
@@ -50,7 +50,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -65,7 +65,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/mingle/minglelib.vcxproj b/lib/mingle/minglelib.vcxproj
index fbbb5b952a2ea8e3fdc11b61f7bee78fcb5be64b..b16ab5ffb0897d2fa37a904303ebbd2e9678609f 100644 (file)
--- a/lib/mingle/minglelib.vcxproj
+++ b/lib/mingle/minglelib.vcxproj
@@ -55,7 +55,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -78,7 +78,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />

diff --git a/lib/neatogen/gvneatogen.vcxproj b/lib/neatogen/gvneatogen.vcxproj
index 3d46c8a334340d733ebab8915583a2f214f2fe7f..80dfa290754798d8866d064995b5edcc52d28772 100644 (file)
--- a/lib/neatogen/gvneatogen.vcxproj
+++ b/lib/neatogen/gvneatogen.vcxproj
@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c
index 61c53b3474b20fdd4f9b65bad32931c80fe00759..a569b4877b21b63f2c6562baa864a8da6fa884ac 100644 (file)
--- a/lib/neatogen/neatoinit.c
+++ b/lib/neatogen/neatoinit.c
@@ -15,7 +15,7 @@
 #include "config.h"
 
 #include <time.h>
-#ifndef WIN32
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include <ctype.h>
@@ -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 3621e6c52ccf41e73373c7708ce6e6ce8a3de83b..ff63ec9ec7dc114ba105e2651f8131a66d7cb06e 100644 (file)
--- 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 483c14c3a637fee53675bfb43d894e3d98b44dc4..c71495d6f64b92ffdf6feb627b079fed894e5120 100644 (file)
--- a/lib/neatogen/stuff.c
+++ b/lib/neatogen/stuff.c
@@ -17,7 +17,7 @@
 #include       "neato.h"
 #include       "stress.h"
 #include       <time.h>
-#ifndef WIN32
+#ifndef _WIN32
 #include       <unistd.h>
 #endif
 

diff --git a/lib/ortho/gvortho.vcxproj b/lib/ortho/gvortho.vcxproj
index 75721311e10343da6516a71d1fdf7659e2571283..16d76e8ebfb5ef6ae5e9150881b18be1b971ded1 100644 (file)
--- a/lib/ortho/gvortho.vcxproj
+++ b/lib/ortho/gvortho.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -67,7 +67,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/ortho/partition.c b/lib/ortho/partition.c
index ffe1159cf3f65e2386492bab821d939b4d6205be..7cf548074c6bcd0d380d3038d451588f27862bb9 100644 (file)
--- 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 42e089d6083a29686e125a2688e071d85af03a63..e071e30fcf94af2f2c308b38141c6a5e3601c41c 100644 (file)
--- a/lib/osage/osage.vcxproj
+++ b/lib/osage/osage.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -67,7 +67,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

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

diff --git a/lib/patchwork/gvpatchwork.vcxproj b/lib/patchwork/gvpatchwork.vcxproj
index 056cac7fa53f98dbcc135c5f27d52b0a879d52b0..a06b77309a4c3508a5954c58c46935e63266ff36 100644 (file)
--- a/lib/patchwork/gvpatchwork.vcxproj
+++ b/lib/patchwork/gvpatchwork.vcxproj
@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/pathplan/Pathplan.vcxproj b/lib/pathplan/Pathplan.vcxproj
index 8413d34c39be83de8837bf828d28cd2622d7cca3..c982ec020e92dc56fda577d5904b071d3284b60f 100644 (file)
--- a/lib/pathplan/Pathplan.vcxproj
+++ b/lib/pathplan/Pathplan.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -73,7 +73,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/rbtree/rbtree.vcxproj b/lib/rbtree/rbtree.vcxproj
index 3b7f2efa3720ad8ed5eb211187d6178517e35ac8..1031e4df1c2dffe763777888dea4d568394f6e18 100644 (file)
--- a/lib/rbtree/rbtree.vcxproj
+++ b/lib/rbtree/rbtree.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -66,7 +66,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/sfdpgen/sfdp.vcxproj b/lib/sfdpgen/sfdp.vcxproj
index 2780fe30863c9b1abbd6e6e9481fc8db22dd3a66..ed0a388e0a2122991d5c71c191ea02db1f6228dc 100644 (file)
--- a/lib/sfdpgen/sfdp.vcxproj
+++ b/lib/sfdpgen/sfdp.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -67,7 +67,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/sfio/sfexit.c b/lib/sfio/sfexit.c
index 33cc4639d026d03f013ab6221cd3f22200de5b4c..278aaa840b61920230c62082b6818ab158e73589 100644 (file)
--- 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 4140eab8bc98083cdfadfb9ae8e814c9f0fd3849..fe0f87814814d0b5f4597feda2e4d54f11082a69 100644 (file)
--- 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 <io.h>
 #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 e0c2d8864f6ba913e28f6d02e9ec3bf830dfd4b8..8235dca81caccebc6e0ad15ccc45207849a44444 100644 (file)
--- a/lib/sfio/sfio.vcxproj
+++ b/lib/sfio/sfio.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -67,7 +67,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/sfio/sfmode.c b/lib/sfio/sfmode.c
index c04e27e3744bbfe4dfabd62d2ec77e0ec9bd785a..aafe61f504412064e7fb7b7812a44f76b4aa700e 100644 (file)
--- 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 19b832371dd8ec8e7e0cb514420a032b67fd27e5..17605c1c0c77027541d33ecb1316c185e5e477aa 100644 (file)
--- 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 55810d7e720ca1b40cb12480c24500a173319c08..ec616dd4d41e49edf454ef6483a2cfccd01b771a 100644 (file)
--- 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 956215914df8a14d0ce74769f1abfc5ead306deb..48c17c8fb761a6ee858e0efc91b1a3b669d4a9ae 100644 (file)
--- a/lib/sparse/gvsparse.vcxproj
+++ b/lib/sparse/gvsparse.vcxproj
@@ -52,7 +52,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -67,7 +67,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/topfish/topfish.vcxproj b/lib/topfish/topfish.vcxproj
index 9439f3e783a3739ce7b885f94ce4922f029fb8ec..46094b35871e247a48f313bd7f05ed76fb0dfc4b 100644 (file)
--- a/lib/topfish/topfish.vcxproj
+++ b/lib/topfish/topfish.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -66,7 +66,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/twopigen/gvtwopigen.vcxproj b/lib/twopigen/gvtwopigen.vcxproj
index 4faea276899542ad824da6fd41051376c299d563..5f80778fbefea6b80131ea4a854d1cca1ef5cc71 100644 (file)
--- a/lib/twopigen/gvtwopigen.vcxproj
+++ b/lib/twopigen/gvtwopigen.vcxproj
@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/vmalloc/vmalloc.vcxproj b/lib/vmalloc/vmalloc.vcxproj
index 1d80d104f7d28d1af48199eb2691d628d84c18c8..adb54d6d2f68674767d613c2af4267bec59b52bb 100644 (file)
--- a/lib/vmalloc/vmalloc.vcxproj
+++ b/lib/vmalloc/vmalloc.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />

diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h
index 993aa8635a8dc51a1613c816787ab8ccfbc319ab..4c1f3c25e8710358b2debbf923549b08f3f95eb4 100644 (file)
--- 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 <io.h>
 #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       <string.h>
 
 /* 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 fe43eb8f5c9b985008f3c49d47a1a297d3c391fb..077f06c0d10ebe6045d131720c6e75bad8d5188b 100644 (file)
--- 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<n;i++) {
                delete rs[i];
        }
-#ifdef WIN32
+#ifdef _WIN32
     delete [] rs;
 #endif
        return m;
 }
 int genYConstraints(int n, boxf* bb, Variable** vs, Constraint*** cs) {
-#ifdef WIN32
+#ifdef _WIN32
        Rectangle** rs = new Rectangle* [n];
 #else
        Rectangle* rs[n];
@@ -69,7 +69,7 @@ int genYConstraints(int n, boxf* bb, Variable** vs, Constraint*** cs) {
        for(int i=0;i<n;i++) {
                delete rs[i];
        }
-#ifdef WIN32
+#ifdef _WIN32
     delete [] rs;
 #endif
        return m;

diff --git a/lib/vpsc/vpsc.vcxproj b/lib/vpsc/vpsc.vcxproj
index 5ac2aa87a43be4ba456afa90376edb35ed3467c8..aaecc756f5a778bdb7990a1b30fc14fbd49db7a6 100644 (file)
--- a/lib/vpsc/vpsc.vcxproj
+++ b/lib/vpsc/vpsc.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -66,7 +66,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

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

diff --git a/lib/xdot/xdot.vcxproj b/lib/xdot/xdot.vcxproj
index bd266b62dc2e0b7a8614d2c63794302cbda8a62e..0abff472cab11bf7bb63c3186a61ca9cf1b10689 100644 (file)
--- a/lib/xdot/xdot.vcxproj
+++ b/lib/xdot/xdot.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;EXPORT_XDOT;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>EXPORT_XDOT;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;EXPORT_XDOT;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>EXPORT_XDOT;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/plugin/core/gvplugin_core.c b/plugin/core/gvplugin_core.c
index 53d7866ff4fafa03b18db6abcd2c507454312156..9e9a61265d34368c8727f73f43f751374624cca8 100644 (file)
--- 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 139ce1d839724cf9645562f191d363499e21c5b4..29e30d08b78066ab7ed35c425c60e249d26c5dba 100644 (file)
--- a/plugin/core/gvplugin_core.vcxproj
+++ b/plugin/core/gvplugin_core.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c
index d619ef15d09fc82703f3580e9be17c782a583c3f..f086278f2097a90ffe495fcb2c0a9b81c77e76b1 100644 (file)
--- 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 <io.h>
 #include "compat.h"
 #endif

diff --git a/plugin/core/gvrender_core_fig.c b/plugin/core/gvrender_core_fig.c
index 328b6483730f3f1f967645abd8ec358d6d0417ed..b01b7b524e54e9b60894045e3091acc5a1c70dce 100644 (file)
--- a/plugin/core/gvrender_core_fig.c
+++ b/plugin/core/gvrender_core_fig.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #include "compat.h"
 #endif

diff --git a/plugin/core/gvrender_core_hpgl.c b/plugin/core/gvrender_core_hpgl.c
index 90d7377d5599feeba7801436611a608a8d39367a..f0ce48f51749807ecce5330baa78f05fd9870126 100644 (file)
--- a/plugin/core/gvrender_core_hpgl.c
+++ b/plugin/core/gvrender_core_hpgl.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #include "compat.h"
 #endif

diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c
index 4ac49081a1ef2e17218d4bcddb84eb16da074656..8c0bbe4d2e93685f4bda01a960ab799d421e121b 100644 (file)
--- 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 <io.h>
 #include "compat.h"
 #endif

diff --git a/plugin/core/gvrender_core_mp.c b/plugin/core/gvrender_core_mp.c
index 96a37427e15536f47160b871148920cb3cda9537..d027d998012e831afc48d29ccc961efff5138553 100644 (file)
--- a/plugin/core/gvrender_core_mp.c
+++ b/plugin/core/gvrender_core_mp.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #include "compat.h"
 #endif

diff --git a/plugin/core/gvrender_core_vtx.c b/plugin/core/gvrender_core_vtx.c
index 432e6232368702b9f3d9d4a8db81b3a694a2b39a..610630786b8e2290addf0aca7fa1d87b5ade3ab8 100644 (file)
--- a/plugin/core/gvrender_core_vtx.c
+++ b/plugin/core/gvrender_core_vtx.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #include "compat.h"
 #endif

diff --git a/plugin/dot_layout/gvplugin_dot_layout.vcxproj b/plugin/dot_layout/gvplugin_dot_layout.vcxproj
index 85f3bed4e0c5b91613f1a0493603153c18606f52..1014aad96f6e883363dc672593a828da211057a2 100644 (file)
--- a/plugin/dot_layout/gvplugin_dot_layout.vcxproj
+++ b/plugin/dot_layout/gvplugin_dot_layout.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/plugin/gd/gvplugin_gd.vcxproj b/plugin/gd/gvplugin_gd.vcxproj
index 10f39bddcc5b5d7ac8a81a3e418d2584b8113154..6d1f186d0d18a7bc397bdeb52753255fba41bf82 100644 (file)
--- a/plugin/gd/gvplugin_gd.vcxproj
+++ b/plugin/gd/gvplugin_gd.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -85,7 +85,7 @@ copy $(SolutionDir)windows\dependencies\GTK2\bin\iconv.dll $(OutDir)iconv.dll</C
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
index e230dd8d2411805c4410da4cca701d8b0f642d5f..858d7f44aa42bbae3afcb4d453f5b9fe4676ea5f 100644 (file)
--- a/plugin/gd/gvrender_gd.c
+++ b/plugin/gd/gvrender_gd.c
@@ -13,7 +13,7 @@
 
 #include "config.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #endif
 #include <stdlib.h>

diff --git a/plugin/gdiplus/gvplugin_gdiplus.vcxproj b/plugin/gdiplus/gvplugin_gdiplus.vcxproj
index 77c18db5cfcc7f4df893e290c8cad52a8a061bc2..de9372206424b4a06cc1b2185a3cc1b881efb854 100644 (file)
--- a/plugin/gdiplus/gvplugin_gdiplus.vcxproj
+++ b/plugin/gdiplus/gvplugin_gdiplus.vcxproj
@@ -54,7 +54,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/plugin/gdk/gvloadimage_gdk.c b/plugin/gdk/gvloadimage_gdk.c
index 4855e4670fc89f9461e79405c9c61442e3bebffd..343a6c251b37926521b4ea13d953d0858c344702 100644 (file)
--- a/plugin/gdk/gvloadimage_gdk.c
+++ b/plugin/gdk/gvloadimage_gdk.c
@@ -23,7 +23,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkcairo.h>
 
-#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 83eee38cea19482d96cc328ed7e7dd7c8e4cb1db..0fee65f0745f99d8ac73d2538c4707f7c6fe3ed2 100644 (file)
--- 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 54e7b6920baffd9a1f7d77e1fb71856aa7f0319d..9e63b6713db0e6328505113df803de443a0b6899 100644 (file)
--- a/plugin/neato_layout/gvplugin_neato_layout.vcxproj
+++ b/plugin/neato_layout/gvplugin_neato_layout.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/plugin/pango/gvgetfontlist_pango.c b/plugin/pango/gvgetfontlist_pango.c
index 1ea31e20361e83c446f68e0f41d20752f1fd3192..d03bc738cc5d729825e24e3e01dc2b7e8d6d95b0 100644 (file)
--- 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 b6efc5ebfe1be87e31b54c4074e088ebb5c436af..deb5767fafedda51033120bd331f9a5d21ef919e 100644 (file)
--- a/plugin/pango/gvplugin_pango.vcxproj
+++ b/plugin/pango/gvplugin_pango.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@ $(SolutionDir)windows\dependencies\GTK2\bin\pango-querymodules.exe &gt; $(OutDir
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c
index d620b2997156ea2a74349e6510b574ef220a9591..ff25a6a89007fcb3e60896c1660e6d549ab4f64e 100644 (file)
--- 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 e84797867071156b6f9de06998f0066992f18172..7fd3492434414b3c3b2271149fd84f77e86b91da 100644 (file)
--- a/plugin/poppler/gvloadimage_poppler.c
+++ b/plugin/poppler/gvloadimage_poppler.c
@@ -23,7 +23,7 @@
 #include <poppler.h>
 #include <cairo.h>
 
-#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 69ecdf4b9be60cac99e94b524193af34e616c4b4..56ef22c35123be2e6ee1dc6a9d982f09bb181f60 100644 (file)
--- a/plugin/rsvg/gvloadimage_rsvg.c
+++ b/plugin/rsvg/gvloadimage_rsvg.c
@@ -26,7 +26,7 @@
 #endif
 #include <cairo/cairo-svg.h>
 
-#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 b2c1a5d771cc2bd6355b306877ac790e080b73ff..da2421e60d039c0a22b53c7f1c03be2f0a58edfa 100644 (file)
--- 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 55e0c2d50a99bae5d5716d4190bd10948c45306d..5c828290570b19b0583b59df1b88b53ba72bba77 100644 (file)
--- a/plugin/webp/gvloadimage_webp.c
+++ b/plugin/webp/gvloadimage_webp.c
@@ -24,7 +24,7 @@
 #include <cairo.h>
 #include <webp/decode.h>
 
-#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 245e30c9c1354b56d842286b69e68505ce641916..e0b0d5bb25f05cdf628d04bd03d40271f45e1ffa 100644 (file)
--- a/tclpkg/gdtclft/gdtclft.c
+++ b/tclpkg/gdtclft/gdtclft.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include "gd.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif
 

diff --git a/windows/include/ps_font_equiv.h b/windows/include/ps_font_equiv.h
index 712e3ba6fca4511e7fc163200c865e6665b0ea8b..acc8c0f174365eb757de906d62a6c27260e79e5a 100644 (file)
--- 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"