From d90112d0862dcf9eb44cf9ea70734371fce19bd0 Mon Sep 17 00:00:00 2001
From: Adam Murdoch <adam.murdoch@gradleware.com>
Date: Sat, 15 Mar 2014 16:13:53 +1100
Subject: [PATCH] Use _WIN32 to detect if building for Windows.

---
 build.gradle                     | 1 -
 src/curses/cpp/curses.cpp        | 2 +-
 src/main/cpp/posix.cpp           | 2 +-
 src/main/cpp/win.cpp             | 2 +-
 src/shared/cpp/generic_posix.cpp | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6d9bcf6..cea524c 100755
--- a/build.gradle
+++ b/build.gradle
@@ -130,7 +130,6 @@ libraries {
             } else if (targetPlatform.operatingSystem.windows) {
                 cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include"
                 cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32"
-                cppCompiler.define("WIN32")
                 linker.args "Shlwapi.lib", "Advapi32.lib"
             } else if (targetPlatform.operatingSystem.freeBSD) {
                 cppCompiler.args '-I', "${org.gradle.internal.jvm.Jvm.current().javaHome}/include"
diff --git a/src/curses/cpp/curses.cpp b/src/curses/cpp/curses.cpp
index c891d25..f5e8352 100644
--- a/src/curses/cpp/curses.cpp
+++ b/src/curses/cpp/curses.cpp
@@ -17,7 +17,7 @@
 /*
  * Curses functions
  */
-#ifndef WIN32
+#ifndef _WIN32
 
 #include "native.h"
 #include "generic.h"
diff --git a/src/main/cpp/posix.cpp b/src/main/cpp/posix.cpp
index 7e377f7..de106ae 100755
--- a/src/main/cpp/posix.cpp
+++ b/src/main/cpp/posix.cpp
@@ -17,7 +17,7 @@
 /*
  * POSIX platform functions.
  */
-#ifndef WIN32
+#ifndef _WIN32
 
 #include "native.h"
 #include "generic.h"
diff --git a/src/main/cpp/win.cpp b/src/main/cpp/win.cpp
index 68b3213..94cb671 100755
--- a/src/main/cpp/win.cpp
+++ b/src/main/cpp/win.cpp
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include "native.h"
 #include "generic.h"
diff --git a/src/shared/cpp/generic_posix.cpp b/src/shared/cpp/generic_posix.cpp
index 9dfbe27..b8cc26f 100644
--- a/src/shared/cpp/generic_posix.cpp
+++ b/src/shared/cpp/generic_posix.cpp
@@ -17,7 +17,7 @@
 /*
  * POSIX platform functions.
  */
-#ifndef WIN32
+#ifndef _WIN32
 
 #include "native.h"
 #include "generic.h"