vmcontrol wrapper not currently support on native 64-bit

bindings/java/src/jni/vmware/javavmware.c

@@ -16,13 +16,13 @@
  * USA.
  */
 
-#if defined(WIN32) || defined(__linux__)
-
 #include <jni.h>
 #include <stdlib.h>
 
 #include "vmcontrol_wrapper.h"
 
+#ifdef VMCONTROL_WRAPPER_SUPPORTED
+
 #define JENV (*env)
 
 #define VMWARE_PACKAGE "org/hyperic/sigar/vmware/"
@@ -745,4 +745,4 @@ JNIEXPORT jboolean VMWARE_JNI(VM_deviceIsConnected)
     return isConnected;
 }
 
-#endif /* WIN32 || linux */
+#endif /* VMCONTROL_WRAPPER_SUPPORTED */

bindings/java/src/jni/vmware/vmcontrol_wrapper.c

@@ -16,7 +16,9 @@
  * USA.
  */
 
-#if defined(WIN32) || defined(__linux__)
+#include "vmcontrol_wrapper.h"
+
+#ifdef VMCONTROL_WRAPPER_SUPPORTED
 
 #ifdef WIN32
 #include <windows.h>
@@ -29,8 +31,6 @@
 
 #include <stdio.h>
 
-#include "vmcontrol_wrapper.h"
-
 #ifdef WIN32
 #define DL_LOAD(lib)  LoadLibrary(lib)
 #define DL_CLOSE(h)   FreeLibrary(h)

bindings/java/src/jni/vmware/vmcontrol_wrapper.h

@@ -19,6 +19,10 @@
 #ifndef VMCONTROL_WRAPPER_H
 #define VMCONTROL_WRAPPER_H
 
+#if defined(WIN32) || defined(__linux__) && !defined(__LP64__)
+
+#define VMCONTROL_WRAPPER_SUPPORTED
+
 /* types defined by vmcontrol.h */
 typedef struct VMControlServer VMControlServer;
 
@@ -232,4 +236,6 @@ vmcontrol_wrapper_api_t *vmcontrol_wrapper_api_get(void);
 #define VMControl_VMToolsLastActive \
   vmcontrol_wrapper_api_get()->xVMControl_VMToolsLastActive
 
+#endif
+
 #endif /* VMCONTROL_WRAPPER_H */