svn commit: r293268 - in head/sys/boot/efi/include: amd64 arm64 i386

Steven Hartland smh at FreeBSD.org
Wed Jan 6 20:22:30 UTC 2016


Author: smh
Date: Wed Jan  6 20:22:28 2016
New Revision: 293268
URL: https://svnweb.freebsd.org/changeset/base/293268

Log:
  Fix _MSC_EXTENSIONS checks
  
  Use #ifdef instead of #if checks to prevent warnings generated by checks
  to be enabled shortly.
  
  MFC after:	2 weeks
  Sponsored by:	Multiplay

Modified:
  head/sys/boot/efi/include/amd64/efibind.h
  head/sys/boot/efi/include/arm64/efibind.h
  head/sys/boot/efi/include/i386/efibind.h

Modified: head/sys/boot/efi/include/amd64/efibind.h
==============================================================================
--- head/sys/boot/efi/include/amd64/efibind.h	Wed Jan  6 20:21:40 2016	(r293267)
+++ head/sys/boot/efi/include/amd64/efibind.h	Wed Jan  6 20:22:28 2016	(r293268)
@@ -39,7 +39,7 @@ Revision History
 
     // No ANSI C 1999/2000 stdint.h integer width declarations 
 
-    #if _MSC_EXTENSIONS
+    #ifdef _MSC_EXTENSIONS
 
         // Use Microsoft C compiler integer width declarations 
 
@@ -164,7 +164,7 @@ typedef uint64_t   UINTN;
 #endif
 
 #ifndef EFIAPI                  // Forces EFI calling conventions reguardless of compiler options 
-    #if _MSC_EXTENSIONS
+    #ifdef _MSC_EXTENSIONS
         #define EFIAPI __cdecl  // Force C calling convention for Microsoft C compiler 
     #else
         #define EFIAPI          // Substitute expresion to force C calling convention 
@@ -265,7 +265,7 @@ typedef uint64_t   UINTN;
 #endif
 #endif	/* __FreeBSD__ */
 
-#if _MSC_EXTENSIONS
+#ifdef _MSC_EXTENSIONS
 #pragma warning ( disable : 4731 )  // Suppress warnings about modification of EBP
 #endif
 

Modified: head/sys/boot/efi/include/arm64/efibind.h
==============================================================================
--- head/sys/boot/efi/include/arm64/efibind.h	Wed Jan  6 20:21:40 2016	(r293267)
+++ head/sys/boot/efi/include/arm64/efibind.h	Wed Jan  6 20:22:28 2016	(r293268)
@@ -39,7 +39,7 @@ Revision History
 
     // No ANSI C 1999/2000 stdint.h integer width declarations 
 
-    #if _MSC_EXTENSIONS
+    #ifdef _MSC_EXTENSIONS
 
         // Use Microsoft C compiler integer width declarations 
 
@@ -159,7 +159,7 @@ typedef uint64_t   UINTN;
 //
 
 #ifndef EFIAPI                  // Forces EFI calling conventions reguardless of compiler options 
-    #if _MSC_EXTENSIONS
+    #ifdef _MSC_EXTENSIONS
         #define EFIAPI __cdecl  // Force C calling convention for Microsoft C compiler 
     #else
         #define EFIAPI          // Substitute expresion to force C calling convention 

Modified: head/sys/boot/efi/include/i386/efibind.h
==============================================================================
--- head/sys/boot/efi/include/i386/efibind.h	Wed Jan  6 20:21:40 2016	(r293267)
+++ head/sys/boot/efi/include/i386/efibind.h	Wed Jan  6 20:22:28 2016	(r293268)
@@ -39,7 +39,7 @@ Revision History
 
     // No ANSI C 1999/2000 stdint.h integer width declarations 
 
-    #if _MSC_EXTENSIONS
+    #ifdef _MSC_EXTENSIONS
 
         // Use Microsoft C compiler integer width declarations 
 
@@ -160,7 +160,7 @@ typedef uint32_t   UINTN;
 //
 
 #ifndef EFIAPI                  // Forces EFI calling conventions reguardless of compiler options 
-    #if _MSC_EXTENSIONS
+    #ifdef _MSC_EXTENSIONS
         #define EFIAPI __cdecl  // Force C calling convention for Microsoft C compiler 
     #else
         #define EFIAPI          // Substitute expresion to force C calling convention 
@@ -261,7 +261,7 @@ typedef uint32_t   UINTN;
 #endif
 #endif	/* __FreeBSD__ */
 
-#if _MSC_EXTENSIONS
+#ifdef _MSC_EXTENSIONS
 #pragma warning ( disable : 4731 )  // Suppress warnings about modification of EBP
 #endif
 


More information about the svn-src-all mailing list