Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/cpuid_info.h b/open-vm-tools/lib/include/cpuid_info.h
index 4ce2542343e0a29dd1d647004577e20699b87402..9dc456e45060a21bc75150f5b2447bc68c7b8cb3 100644 (file)
--- a/open-vm-tools/lib/include/cpuid_info.h
+++ b/open-vm-tools/lib/include/cpuid_info.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2008 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2011 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -134,6 +134,7 @@ static INLINE uint32
 CPUIDSummary_VIACoresPerPackage(CPUIDSummary *cpuid,
                                 uint32 *numThreadsPerCore)
 {
+   (void) cpuid;
    *numThreadsPerCore = 1;
    return 1;
 }

diff --git a/open-vm-tools/lib/include/posix.h b/open-vm-tools/lib/include/posix.h
index 79a33f2435ce8a9643d9023bd3b4aedd22ae0b77..13b7fa18314cd69768fbf4a06c3b33edba46cdc1 100644 (file)
--- a/open-vm-tools/lib/include/posix.h
+++ b/open-vm-tools/lib/include/posix.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008-2011 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -277,6 +277,8 @@ Posix_FreeHostent(struct hostent *he)
       free(he->h_addr_list);
       free(he);
    }
+#else
+   (void) he;
 #endif
 }
 

diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index 54cb17655f6224f34f02202396613f7b847852cb..c5eee326058180cb81916165390b9f820d4a0e60 100644 (file)
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -86,6 +86,9 @@
 #include "vm_basic_types.h"
 #include "vm_basic_defs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * Internal macros, functions, and strings
@@ -372,5 +375,8 @@ EXTERN void WarningThrottled(uint32 *count, const char *fmt, ...)
       assertions \
    }
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
 
 #endif /* ifndef _VM_ASSERT_H_ */

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index c1f0b6df619070e2dee16ae1a735ae7abdf0729a..6e3b47656fc8d610e4cc11eebc2da5d85ae4a6de 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -259,16 +259,16 @@
 #define NETDUMP_FILE_VERSION    1,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #define VDDK_VERSION          "5.1.0"
 #define VDDK_FILE_VERSION      5,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
-#define OVFTOOL_VERSION "2.1.0"
+#define OVFTOOL_VERSION "e.x.p"
 #define VDM_CLIENT_VERSION "e.x.p"
 #define VGAUTH_VERSION "e.x.p"
 #define VIEWY_VERSION "e.x.p"
 #define VMCFSDK_VERSION "e.x.p"
 #define PCOIP_VERSION "e.x.p"
 #define VIEW_VERSION "0.0.0"
+#define HOSTD_VERSION "e.x.p"
 
 
-// VMRC_PLUGIN_VERSION should match PLAYER_VERSION but can't be e.x.p
 #ifndef MAKESTR
 #define MAKESTR(x) #x
 #define XSTR(x) MAKESTR(x)
@@ -277,7 +277,7 @@
 // This extra version define is here so the Makefiles can easily pick it up.
 // See the VMRC_PLUGIN_VERSION section in /mk/defs-onetime.mk
 
-#define VMRC_PLUGIN_VERSION_MAJOR 4
+#define VMRC_PLUGIN_VERSION_MAJOR 5
 #define VMRC_PLUGIN_VERSION_MINOR 0
 #define VMRC_PLUGIN_VERSION_Z     0
 
@@ -286,7 +286,7 @@
  * #define VMRC_PLUGIN_VERSION_NUMBER       \
  *         XSTR(VMRC_PLUGIN_VERSION_MAJOR) "." XSTR(VMRC_PLUGIN_VERSION_MINOR) "." XSTR(VMRC_PLUGIN_VERSION_Z)
  */
-#define VMRC_PLUGIN_VERSION_NUMBER "4.0.0"
+#define VMRC_PLUGIN_VERSION_NUMBER "5.0.0"
 
 /* this version number should always match real VMRC & plugin version number */
 #define VMRC_VERSION VMRC_PLUGIN_VERSION_NUMBER
@@ -305,7 +305,7 @@
 
 #define USB_ARBITRATOR_VERSION_MAJOR 9
 #define USB_ARBITRATOR_VERSION_MINOR 0
-#define USB_ARBITRATOR_VERSION_Z     33
+#define USB_ARBITRATOR_VERSION_Z     38
 
 #define USB_ARBITRATOR_VERSION_BASE  USB_ARBITRATOR_VERSION_MAJOR.\
                                      USB_ARBITRATOR_VERSION_MINOR
@@ -321,7 +321,7 @@
  * USB Arbitrator Component version. This version is used by the linux
  * installer. See USB_ARBITRATOR_COMPONENT_VERSION_NUMBER in mk/defs-onetime.mk
  */
-#define USB_ARBITRATOR_COMPONENT_VERSION_NUMBER "9.0.33"
+#define USB_ARBITRATOR_COMPONENT_VERSION_NUMBER "9.0.38"
 
 #ifdef VMX86_VPX
 #define VIM_API_TYPE "VirtualCenter"