On 01/11/2013 03:17 PM, Alex Riesen wrote:
On Fri, Jan 11, 2013 at 9:08 PM, Alex Riesen <raa.lkml@xxxxxxxxx> wrote:
This short discussion on GitHub (file git-compat-util.h) might be relevant:
https://github.com/msysgit/git/commit/435bdf8c7ffa493f8f6f2e8f329f8cc22db16ce6#commitcomment-2407194
The change suggested there (to remove an inclusion of windows.h in
git-compat-util.h) might simplify the solution a little. Might even
remove the need for auto-configuration in Makefile (worked for me).
Just to be clear, the change is this:
diff --git a/git-compat-util.h b/git-compat-util.h
index 4a1979f..780a919 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -85,12 +85,6 @@
#define _NETBSD_SOURCE 1
#define _SGI_SOURCE 1
-#ifdef WIN32 /* Both MinGW and MSVC */
-#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
-#include <winsock2.h>
-#include <windows.h>
-#endif
-
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
That change alone seems fine, no apparent change building on current
cygwin. However, with that change the build still fails if
CYGWIN_V15_WIN32API is defined, so unless someone can show the
compilation works on cygwin1.5 WITHOUT defining CYGWIN_V15_WIN32API this
change does not help. I do not have an older installation available, so
cannot test. Frankly, assuming you can compile with that macro defined,
I would suggest leaving well enough alone - an unsupported configuration
is unsupported :^)
Mark
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html