Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Win32 fixes #636

Merged
merged 2 commits into from Apr 22, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/git2/common.h
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/xdiff/xinclude.h
Expand Up @@ -29,7 +29,7 @@
#include <string.h>
#include <limits.h>

#ifdef GIT_WIN32
#ifdef _WIN32
#else
#include <unistd.h>
#endif
Expand Down