Author: smh
Date: Mon Jan 25 10:41:23 2016
New Revision: 294715
URL: https://svnweb.freebsd.org/changeset/base/294715
Log:
MFC r293268:
Fix _MSC_EXTENSIONS checks
Sponsored by: Multiplay
Modified:
stable/10/sys/boot/efi/include/amd64/efibind.h
stable/10/sys/boot/efi/include/i386/efibind.h
stable/10/sys/boot/efi/include/ia64/efibind.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/boot/efi/include/amd64/efibind.h
==============================================================================
--- stable/10/sys/boot/efi/include/amd64/efibind.h Mon Jan 25 10:23:36
2016 (r294714)
+++ stable/10/sys/boot/efi/include/amd64/efibind.h Mon Jan 25 10:41:23
2016 (r294715)
@@ -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 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
@@ -261,7 +261,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: stable/10/sys/boot/efi/include/i386/efibind.h
==============================================================================
--- stable/10/sys/boot/efi/include/i386/efibind.h Mon Jan 25 10:23:36
2016 (r294714)
+++ stable/10/sys/boot/efi/include/i386/efibind.h Mon Jan 25 10:41:23
2016 (r294715)
@@ -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
@@ -156,7 +156,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
@@ -257,7 +257,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
Modified: stable/10/sys/boot/efi/include/ia64/efibind.h
==============================================================================
--- stable/10/sys/boot/efi/include/ia64/efibind.h Mon Jan 25 10:23:36
2016 (r294714)
+++ stable/10/sys/boot/efi/include/ia64/efibind.h Mon Jan 25 10:41:23
2016 (r294715)
@@ -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
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
