path: root/compat/win32.h
diff options
authorMarius Storm-Olsen <>2009-09-16 08:20:26 (GMT)
committerJunio C Hamano <>2009-09-19 03:00:42 (GMT)
commit435bdf8c7ffa493f8f6f2e8f329f8cc22db16ce6 (patch)
tree99c9c20ae9a3913ea1fbf801ca1821fcb2b5e00c /compat/win32.h
parentd75f8e61315cc502c34aec6600db00a7c7192ffd (diff)
Make usage of windows.h lean and mean
Centralize the include of windows.h in git-compat-util.h, turn on WIN32_LEAN_AND_MEAN to avoid including plenty of other header files which is not needed in Git. Also ensure we load winsock2.h first, so we don't load the older winsock definitions at a later stage, since they contain duplicate definitions. When moving windows.h into git-compat-util.h, we need to protect the definition of struct pollfd in mingw.h, since this file is used by both MinGW and MSVC, and the latter defines this struct in winsock2.h. We need to keep the windows.h include in compat/win32.h, since its shared by both MinGW and Cygwin, and we're not touching Cygwin in this commit. The include in git-compat-util.h is protected with an ifdef WIN32, which is not the case when compiling for Cygwin. Signed-off-by: Marius Storm-Olsen <> Acked-by: Johannes Sixt <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'compat/win32.h')
1 files changed, 2 insertions, 0 deletions
diff --git a/compat/win32.h b/compat/win32.h
index e8c178d..8ce9104 100644
--- a/compat/win32.h
+++ b/compat/win32.h
@@ -2,7 +2,9 @@
#define WIN32_H
/* common Win32 functions for MinGW and Cygwin */
+#ifndef WIN32 /* Not defined by Cygwin */
#include <windows.h>
static inline int file_attr_to_st_mode (DWORD attr)