Correctly initialize the vm_atomic.h variables.

Also unrelated changes from private branch merge.

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

diff --git a/open-vm-tools/lib/include/vmware/guestrpc/tclodefs.h b/open-vm-tools/lib/include/vmware/guestrpc/tclodefs.h
index 7c89312c526f0d279e2df9e944fd2c19cf2819f8..ebc6896475d2f04143aacc42af2ab2780e8580fa 100644 (file)
--- a/open-vm-tools/lib/include/vmware/guestrpc/tclodefs.h
+++ b/open-vm-tools/lib/include/vmware/guestrpc/tclodefs.h
@@ -46,7 +46,7 @@
 /*
  * Tools options.
  */
- 
+
 #define TOOLSOPTION_COPYPASTE                "copypaste"
 #define TOOLSOPTION_AUTOHIDE                 "autohide"
 #define TOOLSOPTION_BROADCASTIP              "broadcastIP"
@@ -67,6 +67,12 @@
 
 #define DISK_SHRINK_CMD             "disk.shrink"
 
+/*
+ * Auto-lock commands.
+ */
+
+#define DESKTOP_AUTOLOCK_CMD        "Autolock_Desktop"
+
 
 /*
  * The max selection buffer length has to be less than the

diff --git a/open-vm-tools/libvmtools/vmtools.c b/open-vm-tools/libvmtools/vmtools.c
index a0f8996ecfa79e4d0ce78af146909eb0a99c54a3..47228dda5a558cd5249b971ce71db9249c9b0520 100644 (file)
--- a/open-vm-tools/libvmtools/vmtools.c
+++ b/open-vm-tools/libvmtools/vmtools.c
@@ -33,6 +33,7 @@
 #endif
 
 #include "vmware.h"
+#include "vm_atomic.h"
 #include "wiper.h"
 #include "vmtoolsInt.h"
 #include "vmware/tools/utils.h"
@@ -83,14 +84,16 @@ static void
 VMToolsDllInit(void *lib)
 {
    Bool success;
-#if defined(_WIN32)
    WiperInitData wiperData;
+   Atomic_Init();
+#if defined(_WIN32)
    wiperData.resourceModule = lib;
    success = (NetUtil_LoadIpHlpApiDll() == ERROR_SUCCESS);
    ASSERT(success);
    success = Wiper_Init(&wiperData);
    ASSERT(success);
 #else
+   (void) wiperData;
    success = Wiper_Init(NULL);
    ASSERT(success);
 #endif