summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Martí <tanoku@gmail.com>2012-04-22 11:34:12 -0700
committerVicent Martí <tanoku@gmail.com>2012-04-22 11:34:12 -0700
commit7dbbf4d7f21b5859e24a03c6176a666edb8ef9a9 (patch)
tree56cccb01b27895de1fee64d9d63d140fdde039de
parent69a4bc1988fc242bd0d310781c865cce5481a0e6 (diff)
parent8c327228fdb0bcf130961362b14fec0e9a63c89a (diff)
downloadlibgit2-7dbbf4d7f21b5859e24a03c6176a666edb8ef9a9.tar.gz
Merge pull request #636 from csware/WIN32-fixes
Win32 fixes
-rw-r--r--include/git2/common.h2
-rw-r--r--src/xdiff/xinclude.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/common.h b/include/git2/common.h
index 170ef340d..a66f9c380 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 7d7b77b3e..4a1cde909 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