summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-05 15:12:54 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-05 15:12:54 -0800
commitcd17abdf75207e01bb716c2c7c9f62e56f2f0fdb (patch)
tree8ddefeb14a63c61cc146c262fc0f9e36e73d4b79 /git-compat-util.h
parent5d6c53bb230b20b4bec8fb462df0031a14f4c995 (diff)
parent439fbb807259ad52f1af86ca5e5c98b5f189a246 (diff)
downloadgit-cd17abdf75207e01bb716c2c7c9f62e56f2f0fdb.tar.gz
Merge branch 'vr/msvc'
* vr/msvc: MSVC: Remove unneeded header stubs Compile fix for MSVC: Include <io.h> Compile fix for MSVC: Do not include sys/resources.h
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 230e198fc3..77062ed2a6 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -116,7 +116,12 @@
#else
#include <poll.h>
#endif
-#ifndef __MINGW32__
+#if defined(__MINGW32__)
+/* pull in Windows compatibility stuff */
+#include "compat/mingw.h"
+#elif defined(_MSC_VER)
+#include "compat/msvc.h"
+#else
#include <sys/wait.h>
#include <sys/resource.h>
#include <sys/socket.h>
@@ -145,12 +150,6 @@
#include <grp.h>
#define _ALL_SOURCE 1
#endif
-#else /* __MINGW32__ */
-/* pull in Windows compatibility stuff */
-#include "compat/mingw.h"
-#endif /* __MINGW32__ */
-#ifdef _MSC_VER
-#include "compat/msvc.h"
#endif
#ifndef NO_LIBGEN_H