Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compiler error for Visual Studio 2013+ in ntextapi.h #936

Merged
merged 1 commit into from
Nov 11, 2016
Merged

Fix compiler error for Visual Studio 2013+ in ntextapi.h #936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions psutil/arch/windows/ntextapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -340,5 +336,6 @@ typedef enum _PROCESSINFOCLASS2 {
#define ProcessWow64Information _ProcessWow64Information
#define ProcessDebugPort _ProcessDebugPort
#define ProcessImageFileName _ProcessImageFileName
#define ProcessBreakOnTermination _ProcessBreakOnTermination

#endif // __NTEXTAPI_H__