Don't #include <unistd.h> directly, go through the config files

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14038 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/Config/sys/resource.h b/include/Config/sys/resource.h
index 0b51941424a59582b86b5cf8e81492ad04361946..1f4cc694b2912a57f76f6011d625655d64e03771 100644 (file)
--- a/include/Config/sys/resource.h
+++ b/include/Config/sys/resource.h
@@ -18,22 +18,16 @@
 
 #include "Config/config.h"
 
-#ifdef HAVE_SYS_RESOURCE_H
+#if defined(HAVE_SYS_RESOURCE_H) && !defined(_MSC_VER)
 
 /*
  * In LLVM, we use sys/resource.h to use getrusage() and maybe some other
  * stuff.  Some man pages say that you also need sys/time.h and unistd.h.
  * So, to be paranoid, we will try to include all three if possible.
  */
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
+#include "Config/sys/time.h"
 #include <sys/resource.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include "Config/unistd.h"
 
 #endif
 

diff --git a/include/Config/sys/time.h b/include/Config/sys/time.h
index 2764994717c006186451b89d6de2dff9caf6bc92..3e0ea1e81099571c91f52863c6d235346329a6f2 100644 (file)
--- a/include/Config/sys/time.h
+++ b/include/Config/sys/time.h
@@ -17,7 +17,7 @@
 
 #include "Config/config.h"
 
-#ifdef HAVE_SYS_TIME_H
+#if defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER)
 #include <sys/time.h>
 #endif
 

diff --git a/include/llvm/Config/sys/resource.h b/include/llvm/Config/sys/resource.h
index 0b51941424a59582b86b5cf8e81492ad04361946..1f4cc694b2912a57f76f6011d625655d64e03771 100644 (file)
--- a/include/llvm/Config/sys/resource.h
+++ b/include/llvm/Config/sys/resource.h
@@ -18,22 +18,16 @@
 
 #include "Config/config.h"
 
-#ifdef HAVE_SYS_RESOURCE_H
+#if defined(HAVE_SYS_RESOURCE_H) && !defined(_MSC_VER)
 
 /*
  * In LLVM, we use sys/resource.h to use getrusage() and maybe some other
  * stuff.  Some man pages say that you also need sys/time.h and unistd.h.
  * So, to be paranoid, we will try to include all three if possible.
  */
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
+#include "Config/sys/time.h"
 #include <sys/resource.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include "Config/unistd.h"
 
 #endif
 

diff --git a/include/llvm/Config/sys/time.h b/include/llvm/Config/sys/time.h
index 2764994717c006186451b89d6de2dff9caf6bc92..3e0ea1e81099571c91f52863c6d235346329a6f2 100644 (file)
--- a/include/llvm/Config/sys/time.h
+++ b/include/llvm/Config/sys/time.h
@@ -17,7 +17,7 @@
 
 #include "Config/config.h"
 
-#ifdef HAVE_SYS_TIME_H
+#if defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER)
 #include <sys/time.h>
 #endif