Commit 7dbbf4d7f21b5859e24a03c6176a666edb8ef9a9

Vicent Martí 2012-04-22T11:34:12

Merge pull request #636 from csware/WIN32-fixes Win32 fixes

diff --git a/include/git2/common.h b/include/git2/common.h
index 170ef34..a66f9c3 100644
--- a/include/git2/common.h
+++ b/include/git2/common.h
@@ -51,7 +51,7 @@
 # define GIT_FORMAT_PRINTF(a,b) /* empty */
 #endif
 
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(__CYGWIN__)
+#if (defined(_WIN32)) && !defined(__CYGWIN__)
 #define GIT_WIN32 1
 #endif
 
diff --git a/src/xdiff/xinclude.h b/src/xdiff/xinclude.h
index 7d7b77b..4a1cde9 100644
--- a/src/xdiff/xinclude.h
+++ b/src/xdiff/xinclude.h
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <limits.h>
 
-#ifdef GIT_WIN32
+#ifdef _WIN32
 #else
 #include <unistd.h>
 #endif