[llvm] r221977 - Calm down build bots

[David Majnemer]

Author: majnemer
Date: Fri Nov 14 02:38:17 2014
New Revision: 221977

URL: http://llvm.org/viewvc/llvm-project?rev=221977&view=rev
Log:
Calm down build bots

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

Modified:
    llvm/trunk/include/llvm/Support/COFF.h

Modified: llvm/trunk/include/llvm/Support/COFF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/COFF.h?rev=221977&r1=221976&r2=221977&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/COFF.h (original)
+++ llvm/trunk/include/llvm/Support/COFF.h Fri Nov 14 02:38:17 2014
@@ -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.