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

compile on windows with modern visual studios

This commit is contained in:
Doug MacEachern 2006-10-19 21:30:57 +00:00
parent f5d84d4f67
commit 39a09989ed
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bindings/java/src/jni/win32/metabase.cpp
View File

@ -9,6 +9,7 @@
#include <iadmw.h> // COM Interface header file. #include <iadmw.h> // COM Interface header file.
#include <iiscnfg.h> // MD_ & IIS_MD_ #defines header file. #include <iiscnfg.h> // MD_ & IIS_MD_ #defines header file.
#include <ks.h> #include <ks.h>
extern const CLSID CLSID_StdGlobalInterfaceTable;
#include <atlBase.h> // ATL support header file. #include <atlBase.h> // ATL support header file.
#include "win32bindings.h" #include "win32bindings.h"

38
src/os/win32/sigar_os.h
View File

@ -115,23 +115,6 @@ typedef struct _IP_ADAPTER_INFO {
/* end iptypes.h */ /* end iptypes.h */
/* service manager stuff not in vs6.0 */
typedef struct _SERVICE_STATUS_PROCESS {
DWORD dwServiceType;
DWORD dwCurrentState;
DWORD dwControlsAccepted;
DWORD dwWin32ExitCode;
DWORD dwServiceSpecificExitCode;
DWORD dwCheckPoint;
DWORD dwWaitHint;
DWORD dwProcessId;
DWORD dwServiceFlags;
} SERVICE_STATUS_PROCESS;
typedef enum {
SC_STATUS_PROCESS_INFO = 0
} SC_STATUS_TYPE;
/* from wtsapi32.h not in vs6.0 */ /* from wtsapi32.h not in vs6.0 */
typedef enum { typedef enum {
WTSInitialProgram, WTSInitialProgram,
@ -210,6 +193,8 @@ typedef struct _WINSTATION_INFO {
/* end wtsapi32.h */ /* end wtsapi32.h */
#if _MSC_VER <= 1200
/* from winbase.h not in vs6.0 */ /* from winbase.h not in vs6.0 */
typedef struct { typedef struct {
DWORD dwLength; DWORD dwLength;
@ -223,6 +208,25 @@ typedef struct {
DWORDLONG ullAvailExtendedVirtual; DWORDLONG ullAvailExtendedVirtual;
} MEMORYSTATUSEX; } MEMORYSTATUSEX;
/* service manager stuff not in vs6.0 */
typedef struct _SERVICE_STATUS_PROCESS {
DWORD dwServiceType;
DWORD dwCurrentState;
DWORD dwControlsAccepted;
DWORD dwWin32ExitCode;
DWORD dwServiceSpecificExitCode;
DWORD dwCheckPoint;
DWORD dwWaitHint;
DWORD dwProcessId;
DWORD dwServiceFlags;
} SERVICE_STATUS_PROCESS;
typedef enum {
SC_STATUS_PROCESS_INFO = 0
} SC_STATUS_TYPE;
#endif /* _MSC_VER */
#include <iprtrmib.h> #include <iprtrmib.h>
/* undocumented structures */ /* undocumented structures */