Merge pull request #936 from maxbelanger/fix-compiling-windows

Fix compiler error for Visual Studio 2013+ in `ntextapi.h`
giampaolo · Nov 11, 2016 · 875dd3e · 875dd3e
2 parents 6cf0151 + 0a1c724
commit 875dd3e
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/psutil/arch/windows/ntextapi.h b/psutil/arch/windows/ntextapi.h
@@ -318,12 +318,8 @@ typedef enum _PROCESSINFOCLASS2 {
     /* added after XP+ */
     _ProcessImageFileName,
     ProcessLUIDDeviceMapsEnabled,
-// MSVC 2015 starts forcing C++11 standard, which does not allow duplicate
-// unscoped enumerations.  It doesn't matter that this is C code, MSVC is a C++ compiler.
-#if _MSC_VER < 1900
-    ProcessBreakOnTermination,
-#endif
-    ProcessDebugObjectHandle=ProcessLUIDDeviceMapsEnabled+2,
+    _ProcessBreakOnTermination,
+    ProcessDebugObjectHandle,
     ProcessDebugFlags,
     ProcessHandleTracing,
     ProcessIoPriority,
@@ -340,5 +336,6 @@ typedef enum _PROCESSINFOCLASS2 {
 #define ProcessWow64Information _ProcessWow64Information
 #define ProcessDebugPort _ProcessDebugPort
 #define ProcessImageFileName _ProcessImageFileName
+#define ProcessBreakOnTermination _ProcessBreakOnTermination
 
 #endif // __NTEXTAPI_H__