Merge pull request #672 from stevenwinfield/master

Prevent enum clash when using Windows SDK v8.0
giampaolo · Aug 26, 2015 · ac49006 · ac49006
2 parents 3e5aa8a + e251555
commit ac49006
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/psutil/arch/windows/ntextapi.h b/psutil/arch/windows/ntextapi.h
@@ -186,7 +186,7 @@ typedef enum _PROCESSINFOCLASS2 {
     ProcessTimes,
     ProcessBasePriority,
     ProcessRaisePriority,
-    ProcessDebugPort,
+    _ProcessDebugPort,
     ProcessExceptionPort,
     ProcessAccessToken,
     ProcessLdtInformation,
@@ -207,7 +207,7 @@ typedef enum _PROCESSINFOCLASS2 {
     ProcessForegroundInformation,
     _ProcessWow64Information,
     /* added after XP+ */
-    ProcessImageFileName,
+    _ProcessImageFileName,
     ProcessLUIDDeviceMapsEnabled,
     ProcessBreakOnTermination,
     ProcessDebugObjectHandle,
@@ -224,5 +224,7 @@ typedef enum _PROCESSINFOCLASS2 {
 #define PROCESSINFOCLASS PROCESSINFOCLASS2
 #define ProcessBasicInformation _ProcessBasicInformation
 #define ProcessWow64Information _ProcessWow64Information
+#define ProcessDebugPort _ProcessDebugPort
+#define ProcessImageFileName _ProcessImageFileName
 
 #endif // __NTEXTAPI_H__