summaryrefslogtreecommitdiff
path: root/compat/win32.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-10 09:10:51 -0800
committerJunio C Hamano <gitster@pobox.com>2011-11-10 09:10:51 -0800
commitc444c16589f95ac22d8e3ffe603cd7f0613512ce (patch)
tree31d2e0c2a77344201af6f3ee5427f47218dec9bb /compat/win32.h
parent77f143bf3e218857ec8e5244d7e862e8e0c1a041 (diff)
parent81b50f3ce40bfdd66e5d967bf82be001039a9a98 (diff)
downloadgit-ly/mktree-using-strbuf.tar.gz
Merge "Move 'builtin-*' into a 'builtin/' subdirectory"ly/mktree-using-strbuf
Diffstat (limited to 'compat/win32.h')
-rw-r--r--compat/win32.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/compat/win32.h b/compat/win32.h
index c26384e595..8ce91048de 100644
--- a/compat/win32.h
+++ b/compat/win32.h
@@ -1,5 +1,10 @@
+#ifndef WIN32_H
+#define WIN32_H
+
/* common Win32 functions for MinGW and Cygwin */
+#ifndef WIN32 /* Not defined by Cygwin */
#include <windows.h>
+#endif
static inline int file_attr_to_st_mode (DWORD attr)
{
@@ -32,3 +37,5 @@ static inline int get_file_attr(const char *fname, WIN32_FILE_ATTRIBUTE_DATA *fd
return ENOENT;
}
}
+
+#endif