For PR351:

* Ensure #includes are wrapped with appropriate HAVE_ guards

llvm-svn: 19156

llvm/lib/System/Unix/MappedFile.cpp

@@ -16,10 +16,20 @@
 //===          is guaranteed to work on *all* UNIX variants.
 //===----------------------------------------------------------------------===//
 
-#include "llvm/System/Process.h"
 #include "Unix.h"
+#include "llvm/System/Process.h"
+
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+
+#ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 
 namespace llvm {
 using namespace sys;

llvm/lib/System/Unix/Program.cpp

@@ -18,13 +18,16 @@
 
 #include <llvm/Config/config.h>
 #include "Unix.h"
-#include <sys/stat.h>
-#include <signal.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
 #include <iostream>
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#if HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
 
 extern char** environ;
 

llvm/lib/System/Unix/Signals.cpp

@@ -15,11 +15,12 @@
 #include "Unix.h"
 #include <vector>
 #include <algorithm>
-#ifdef HAVE_EXECINFO_H
+#if HAVE_EXECINFO_H
 # include <execinfo.h>         // For backtrace().
 #endif
-#include <sys/wait.h>
+#if HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 
 namespace {