From owner-svn-src-stable-10@freebsd.org Mon Jan 25 10:41:25 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2BF1FA457E1; Mon, 25 Jan 2016 10:41:25 +0000 (UTC) (envelope-from smh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 043B0B18; Mon, 25 Jan 2016 10:41:24 +0000 (UTC) (envelope-from smh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PAfOCT047948; Mon, 25 Jan 2016 10:41:24 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PAfN0V047945; Mon, 25 Jan 2016 10:41:23 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201601251041.u0PAfN0V047945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Mon, 25 Jan 2016 10:41:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r294715 - in stable/10/sys/boot/efi/include: amd64 i386 ia64 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2016 10:41:25 -0000 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