summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-06-22 17:22:03 -0700
committerRussell Belfer <rb@github.com>2013-06-22 17:22:03 -0700
commit9f1b2c5cb79526f274c0c72eed56f9da0efb0321 (patch)
treea9726694697a4bc789b910e287d5af6948a27fa6
parent5d669f0a96ab858750f4fdd90f138225946934c2 (diff)
parenta7ea40955e5bd881508e2a99e2b73b1a1fbf78e3 (diff)
downloadlibgit2-9f1b2c5cb79526f274c0c72eed56f9da0efb0321.tar.gz
Merge pull request #1668 from csware/WC_ERR_INVALID_CHARS
Do not redefine WC_ERR_INVALID_CHARS
-rw-r--r--src/win32/error.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/win32/error.c b/src/win32/error.c
index 4a9a0631f..a62a07e82 100644
--- a/src/win32/error.c
+++ b/src/win32/error.c
@@ -12,7 +12,9 @@
# include <winhttp.h>
#endif
+#ifndef WC_ERR_INVALID_CHARS
#define WC_ERR_INVALID_CHARS 0x80
+#endif
char *git_win32_get_error_message(DWORD error_code)
{