bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vmcontrol wrapper not currently support on native 64-bit

This commit is contained in:
Doug MacEachern 2006-12-05 06:36:15 +00:00
parent 9359bb0a6f
commit 45d95b1f74
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/java/src/jni/vmware/javavmware.c
View File

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

6
bindings/java/src/jni/vmware/vmcontrol_wrapper.c
View File

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

6
bindings/java/src/jni/vmware/vmcontrol_wrapper.h
View File

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