Change to common header files not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/fileIO.h b/open-vm-tools/lib/include/fileIO.h
index fd867393e832c8ea6eb4546cf7adfeeb6a07c0db..b873bd94e0d4a048bf6b45579b17b097f4032a8a 100644 (file)
--- a/open-vm-tools/lib/include/fileIO.h
+++ b/open-vm-tools/lib/include/fileIO.h
@@ -44,8 +44,10 @@
 #include <stdlib.h>
 #if !defined(_WIN32)
 #include <sys/types.h>
+#if !defined(FROBOS)
 #include <dirent.h>
 #endif
+#endif
 
 #include "vm_basic_types.h"
 #include "unicodeTypes.h"

diff --git a/open-vm-tools/lib/include/iovector.h b/open-vm-tools/lib/include/iovector.h
index 170017edd3fa898fa79389298116bd92d33f795d..53d9f95e617fe3783fcfa6626999dcf0503b3d9b 100644 (file)
--- a/open-vm-tools/lib/include/iovector.h
+++ b/open-vm-tools/lib/include/iovector.h
@@ -36,8 +36,8 @@ extern "C" {
 /*
  * Ugly definition of struct iovec.
  */
-#if defined(__linux__) || defined(sun) || defined(__APPLE__) || \
-    defined(__FreeBSD__) || defined(__EMSCRIPTEN__)
+#if (defined(__linux__) || defined(sun) || defined(__APPLE__) || \
+    defined(__FreeBSD__) || defined(__EMSCRIPTEN__)) && !defined(FROBOS)
 #include <sys/uio.h>    // for struct iovec
 #else