Common header file changes not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/poll.h
index 988fe6d034f2ba7ac9ab0cafc78fa6450f68e91c..05ecb9868d63710d491b9647fede3e82390e94ae 100644 (file)
--- a/open-vm-tools/lib/include/poll.h
+++ b/open-vm-tools/lib/include/poll.h
@@ -107,10 +107,17 @@ typedef enum PollClass {
    POLL_CLASS_CPT,
    POLL_CLASS_MKS,
    POLL_FIXED_CLASSES,
+   POLL_DEFAULT_FIXED_CLASSES,
    /* Size enum to maximum */
    POLL_MAX_CLASSES = 31,
 } PollClass;
 
+/*
+ * Do not use; Special pseudo private poll class supported by
+ * PollDefault only
+ */
+#define POLL_DEFAULT_CLASS_NET POLL_FIXED_CLASSES
+#define POLL_DEFAULT_CS_NET    PollClassSet_Singleton(POLL_DEFAULT_CLASS_NET)
 
 /*
  * Each callback is registered in a set of classes

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index c3318b6d65a415857a076cfce958db022bfd2dac..a74d36311943c80b05b4d765610bde60009447e7 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -144,7 +144,7 @@
 
 /* The Solaris 9 cross-compiler complains about these not being used */
 #ifndef sun
-static INLINE int 
+static INLINE int
 Min(int a, int b)
 {
    return a < b ? a : b;
@@ -156,7 +156,7 @@ Min(int a, int b)
 #endif
 
 #ifndef sun
-static INLINE int 
+static INLINE int
 Max(int a, int b)
 {
    return a > b ? a : b;
@@ -211,7 +211,7 @@ Max(int a, int b)
 #endif
 
 
-/* 
+/*
  * Token concatenation
  *
  * The C preprocessor doesn't prescan arguments when they are
@@ -423,7 +423,7 @@ Max(int a, int b)
 #ifdef _MSC_VER
 #ifdef __cplusplus
 extern "C"
-#endif 
+#endif
 void *_ReturnAddress(void);
 #pragma intrinsic(_ReturnAddress)
 #define GetReturnAddress() _ReturnAddress()
@@ -556,7 +556,7 @@ typedef int pid_t;
  * driver.
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && defined(_MSC_VER)
 #define PATH_MAX 256
 #ifndef strcasecmp
 #define strcasecmp(_s1,_s2)   _stricmp((_s1),(_s2))
@@ -638,7 +638,7 @@ typedef int pid_t;
 #define RELEASE_ONLY(x) x
 #else
 #define vmx86_release   0
-#define RELEASE_ONLY(x) 
+#define RELEASE_ONLY(x)
 #endif
 
 #ifdef VMX86_SERVER