From 080c5fe70e4890ddaedaf14988eefa9a8c40367f Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Fri, 14 Nov 2014 08:38:17 +0000 Subject: [PATCH] Calm down build bots 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 --- include/llvm/Support/COFF.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/llvm/Support/COFF.h b/include/llvm/Support/COFF.h index 074d4f9c9d1..150bce50d9a 100644 --- a/include/llvm/Support/COFF.h +++ b/include/llvm/Support/COFF.h @@ -551,7 +551,7 @@ namespace COFF { NUM_DATA_DIRECTORIES }; - enum WindowsSubsystem : uint16_t { + enum WindowsSubsystem { IMAGE_SUBSYSTEM_UNKNOWN = 0, ///< An unknown subsystem. IMAGE_SUBSYSTEM_NATIVE = 1, ///< Device drivers and native Windows processes IMAGE_SUBSYSTEM_WINDOWS_GUI = 2, ///< The Windows GUI subsystem. @@ -570,7 +570,7 @@ namespace COFF { IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION = 16 ///< A BCD application. }; - enum DLLCharacteristics : uint16_t { + enum DLLCharacteristics { /// ASLR with 64 bit address space. IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA = 0x0020, /// DLL can be relocated at load time. -- 2.34.1