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
git-mirror · Dec 5, 2011 · cd17abd · cd17abd
2 parents 5d6c53b + 439fbb8
commit cd17abd
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 19 deletions.
diff --git a/compat/msvc.h b/compat/msvc.h
@@ -4,6 +4,7 @@
 #include <direct.h>
 #include <process.h>
 #include <malloc.h>
+#include <io.h>
 
 /* porting function */
 #define inline __inline

diff --git a/compat/vcbuild/include/arpa/inet.h b/compat/vcbuild/include/arpa/inet.h
diff --git a/compat/vcbuild/include/grp.h b/compat/vcbuild/include/grp.h
diff --git a/compat/vcbuild/include/inttypes.h b/compat/vcbuild/include/inttypes.h
diff --git a/compat/vcbuild/include/netdb.h b/compat/vcbuild/include/netdb.h
diff --git a/compat/vcbuild/include/netinet/in.h b/compat/vcbuild/include/netinet/in.h
diff --git a/compat/vcbuild/include/netinet/tcp.h b/compat/vcbuild/include/netinet/tcp.h
diff --git a/compat/vcbuild/include/pwd.h b/compat/vcbuild/include/pwd.h
diff --git a/compat/vcbuild/include/sys/ioctl.h b/compat/vcbuild/include/sys/ioctl.h
diff --git a/compat/vcbuild/include/sys/select.h b/compat/vcbuild/include/sys/select.h
diff --git a/compat/vcbuild/include/sys/socket.h b/compat/vcbuild/include/sys/socket.h
diff --git a/compat/vcbuild/include/sys/wait.h b/compat/vcbuild/include/sys/wait.h
diff --git a/compat/vcbuild/include/termios.h b/compat/vcbuild/include/termios.h
diff --git 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