From 0a1c7247089f7cb55126335f137eb8c48a2467a2 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Thu, 3 Nov 2016 18:47:23 -0700 Subject: [PATCH] first pass --- psutil/arch/windows/ntextapi.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/psutil/arch/windows/ntextapi.h b/psutil/arch/windows/ntextapi.h index 74adce227..1bbbf2ac0 100644 --- 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__