Merge pull request libgit2#1668 from csware/WC_ERR_INVALID_CHARS

arrbee · arrbee · commit 9f1b2c5cb795 · 2013-06-22T17:22:03.000-07:00
Do not redefine WC_ERR_INVALID_CHARS
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@`
`12`	`12`	`# include <winhttp.h>`
`13`	`13`	`#endif`
`14`	`14`
	`15`	`+#ifndef WC_ERR_INVALID_CHARS`
`15`	`16`	`#define WC_ERR_INVALID_CHARS 0x80`
	`17`	`+#endif`
`16`	`18`
`17`	`19`	`char *git_win32_get_error_message(DWORD error_code)`
`18`	`20`	`{`