diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-11-11 20:16:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 20:16:45 +0100 |
| commit | 875dd3ee9f004daefd1e9f48207e9ba31bcbd9e2 (patch) | |
| tree | 462fe35f0212e8e4a70bc4821fd09a016c3bb861 | |
| parent | 6cf015146b23c402f822489884ebcef8b46ec58b (diff) | |
| parent | 0a1c7247089f7cb55126335f137eb8c48a2467a2 (diff) | |
| download | psutil-875dd3ee9f004daefd1e9f48207e9ba31bcbd9e2.tar.gz | |
Merge pull request #936 from maxbelanger/fix-compiling-windows
Fix compiler error for Visual Studio 2013+ in `ntextapi.h`
| -rw-r--r-- | psutil/arch/windows/ntextapi.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/psutil/arch/windows/ntextapi.h b/psutil/arch/windows/ntextapi.h index 74adce22..1bbbf2ac 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__ |