From owner-svn-src-head@freebsd.org Thu Jan 17 15:35:12 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB3B2149A720; Thu, 17 Jan 2019 15:35:11 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 857856CDAF; Thu, 17 Jan 2019 15:35:11 +0000 (UTC) (envelope-from mckusick@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 684F01C315; Thu, 17 Jan 2019 15:35:05 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0HFZ5Bx087840; Thu, 17 Jan 2019 15:35:05 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0HFZ564087839; Thu, 17 Jan 2019 15:35:05 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <201901171535.x0HFZ564087839@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Thu, 17 Jan 2019 15:35:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r343113 - head/contrib/libc++/include X-SVN-Group: head X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: head/contrib/libc++/include X-SVN-Commit-Revision: 343113 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 857856CDAF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2019 15:35:12 -0000 Author: mckusick Date: Thu Jan 17 15:35:04 2019 New Revision: 343113 URL: https://svnweb.freebsd.org/changeset/base/343113 Log: Fix #if defined broken in -r343111 Pointy-hat-to: mckusick Modified: head/contrib/libc++/include/errno.h Modified: head/contrib/libc++/include/errno.h ============================================================================== --- head/contrib/libc++/include/errno.h Thu Jan 17 14:09:55 2019 (r343112) +++ head/contrib/libc++/include/errno.h Thu Jan 17 15:35:04 2019 (r343113) @@ -35,7 +35,7 @@ Macros: #if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) || !defined(EINTEGRITY) -#ifdef ELAST +#if defined(ELAST) static const int __elast1 = ELAST+1; static const int __elast2 = ELAST+2; @@ -53,46 +53,46 @@ static const int __elast2 = 106; #define ENOTRECOVERABLE __elast1 #define EOWNERDEAD __elast2 #define EINTEGRITY __elast3 -#ifdef ELAST +#if defined(ELAST) #undef ELAST #define ELAST EINTEGRITY #elif !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 #define EOWNERDEAD __elast2 -#ifdef ELAST +#if defined(ELAST) #undef ELAST #define ELAST EOWNERDEAD #elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define EOWNERDEAD __elast1 #define EINTEGRITY __elast2 -#ifdef ELAST +#if defined(ELAST) #undef ELAST #define ELAST EINTEGRITY #elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define EOWNERDEAD __elast1 -#ifdef ELAST +#if defined(ELAST) #undef ELAST #define ELAST EOWNERDEAD #elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 #define EINTEGRITY __elast2 -#ifdef ELAST +#if defined(ELAST) #undef ELAST #define ELAST EINTEGRITY #elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 -#ifdef ELAST +#if defined(ELAST) #undef ELAST #define ELAST ENOTRECOVERABLE #elif defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define EINTEGRITY __elast1 -#ifdef ELAST +#if defined(ELAST) #undef ELAST #define ELAST EINTEGRITY