From 39a09989ed6bd6b7ebf6878c935419850dda7e61 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Thu, 19 Oct 2006 21:30:57 +0000
Subject: [PATCH] compile on windows with modern visual studios

---
 bindings/java/src/jni/win32/metabase.cpp |  1 +
 src/os/win32/sigar_os.h                  | 38 +++++++++++++-----------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/bindings/java/src/jni/win32/metabase.cpp b/bindings/java/src/jni/win32/metabase.cpp
index 6d136f25..aa631999 100644
--- a/bindings/java/src/jni/win32/metabase.cpp
+++ b/bindings/java/src/jni/win32/metabase.cpp
@@ -9,6 +9,7 @@
 #include <iadmw.h>    // COM Interface header file. 
 #include <iiscnfg.h>  // MD_ & IIS_MD_ #defines header file.
 #include <ks.h>
+extern const CLSID CLSID_StdGlobalInterfaceTable;
 #include <atlBase.h>  // ATL support header file.
 
 #include "win32bindings.h"
diff --git a/src/os/win32/sigar_os.h b/src/os/win32/sigar_os.h
index 78b0b2ec..fe39a595 100644
--- a/src/os/win32/sigar_os.h
+++ b/src/os/win32/sigar_os.h
@@ -115,23 +115,6 @@ typedef struct _IP_ADAPTER_INFO {
 
 /* 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 */
 typedef enum {
     WTSInitialProgram,
@@ -210,6 +193,8 @@ typedef struct _WINSTATION_INFO {
 
 /* end wtsapi32.h */
 
+#if _MSC_VER <= 1200
+
 /* from winbase.h not in vs6.0 */
 typedef struct {
     DWORD dwLength;
@@ -223,6 +208,25 @@ typedef struct {
     DWORDLONG ullAvailExtendedVirtual;
 } 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>
 
 /* undocumented structures */