RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-05 06:41:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Calm down build bots

Browse Source 
r221975 seemed to trigger an ambiguous conversion that only irritated
clang, not gcc.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221977 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2014-11-14 08:38:17 +00:00
parent 237544b16d
commit 080c5fe70e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Support/COFF.h
View File

@ -551,7 +551,7 @@ namespace COFF {
NUM_DATA_DIRECTORIES NUM_DATA_DIRECTORIES
}; };
enum WindowsSubsystem : uint16_t { enum WindowsSubsystem {
IMAGE_SUBSYSTEM_UNKNOWN = 0, ///< An unknown subsystem. IMAGE_SUBSYSTEM_UNKNOWN = 0, ///< An unknown subsystem.
IMAGE_SUBSYSTEM_NATIVE = 1, ///< Device drivers and native Windows processes IMAGE_SUBSYSTEM_NATIVE = 1, ///< Device drivers and native Windows processes
IMAGE_SUBSYSTEM_WINDOWS_GUI = 2, ///< The Windows GUI subsystem. IMAGE_SUBSYSTEM_WINDOWS_GUI = 2, ///< The Windows GUI subsystem.
@ -570,7 +570,7 @@ namespace COFF {
IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION = 16 ///< A BCD application. IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION = 16 ///< A BCD application.
}; };
enum DLLCharacteristics : uint16_t { enum DLLCharacteristics {
/// ASLR with 64 bit address space. /// ASLR with 64 bit address space.
IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA = 0x0020, IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA = 0x0020,
/// DLL can be relocated at load time. /// DLL can be relocated at load time.