Merge pull request #636 from csware/WIN32-fixes

Win32 fixes

Merge pull request #636 from csware/WIN32-fixes
Win32 fixes
7dbbf4d7 · Vicent Martí · 69a4bc19 · 8c327228 · 7dbbf4d7 · 7dbbf4d7
Commit 7dbbf4d7 authored Apr 22, 2012 by Vicent Martí
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

include/git2/common.h
+1 -1

src/xdiff/xinclude.h
+1 -1

No files found.
--- 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


--- 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