From owner-svn-src-all@freebsd.org Thu Jan 17 07:29:00 2019 Return-Path: Delivered-To: svn-src-all@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 84F841486A40; Thu, 17 Jan 2019 07:29:00 +0000 (UTC) (envelope-from ml@vishwin.info) Received: from varun.vishwin.info (varun.vishwin.info [46.101.93.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "varun.vishwin.info", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8B22F77994; Thu, 17 Jan 2019 07:28:59 +0000 (UTC) (envelope-from ml@vishwin.info) Received: from varun.vishwin.info (fd35:9eae:7575::2 [IPv6:fd35:9eae:7575::2]) by varun.vishwin.info (OpenSMTPD) with ESMTP id 10f924d9; Thu, 17 Jan 2019 02:28:48 -0500 (EST) Received: from [IPv6:2001:470:8:6ca:cad7:19ff:fec0:a06d] (2001:470:8:6ca:cad7:19ff:fec0:a06d [IPv6:2001:470:8:6ca:cad7:19ff:fec0:a06d]) by varun.vishwin.info (OpenSMTPD) with ESMTPSA id 048d658c TLS version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO; Thu, 17 Jan 2019 02:28:48 -0500 (EST) Subject: Re: svn commit: r343111 - in head: cddl/lib/libdtrace contrib/libc++/include contrib/libxo/tests/gettext contrib/libxo/tests/gettext/po/pig_latin contrib/openbsm/libbsm contrib/openbsm/sys/bsm lib/libc... To: Kirk McKusick References: <201901170635.x0H6ZjEs003767@repo.freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Charlie Li Openpgp: preference=signencrypt Autocrypt: addr=ml@vishwin.info; keydata= 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 MXM= Message-ID: Date: Thu, 17 Jan 2019 02:28:42 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <201901170635.x0H6ZjEs003767@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Q2upOuXpe7R55pKKabqPaXmZDRS9SjAAP" X-Rspamd-Queue-Id: 8B22F77994 X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.991,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2019 07:29:00 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Q2upOuXpe7R55pKKabqPaXmZDRS9SjAAP Content-Type: multipart/mixed; boundary="1McyOKagBQ2yGiA1WxTMzE6saaDEJ8U4b"; protected-headers="v1" From: Charlie Li To: Kirk McKusick Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: Subject: Re: svn commit: r343111 - in head: cddl/lib/libdtrace contrib/libc++/include contrib/libxo/tests/gettext contrib/libxo/tests/gettext/po/pig_latin contrib/openbsm/libbsm contrib/openbsm/sys/bsm lib/libc... References: <201901170635.x0H6ZjEs003767@repo.freebsd.org> In-Reply-To: <201901170635.x0H6ZjEs003767@repo.freebsd.org> --1McyOKagBQ2yGiA1WxTMzE6saaDEJ8U4b Content-Type: text/plain; charset=utf-8 Content-Language: en-GB-large Content-Transfer-Encoding: quoted-printable On 17/01/2019 01:35, Kirk McKusick wrote: > Modified: head/contrib/libc++/include/errno.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/contrib/libc++/include/errno.h Thu Jan 17 06:34:39 2019 (r3431= 10) > +++ head/contrib/libc++/include/errno.h Thu Jan 17 06:35:45 2019 (r3431= 11) > @@ -33,49 +33,72 @@ Macros: > =20 > #ifdef __cplusplus > =20 > -#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) > +#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) || !defined(EINT= EGRITY) > =20 > #ifdef ELAST > =20 > static const int __elast1 =3D ELAST+1; > static const int __elast2 =3D ELAST+2; > +static const int __elast2 =3D ELAST+3; > =20 > #else > =20 > static const int __elast1 =3D 104; > static const int __elast2 =3D 105; > +static const int __elast2 =3D 106; > =20 > #endif > =20 > -#ifdef ENOTRECOVERABLE > +#if !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINT= EGRITY) > +#define ENOTRECOVERABLE __elast1 > +#define EOWNERDEAD __elast2 > +#define EINTEGRITY __elast3 > +#ifdef ELAST > +#undef ELAST > +#define ELAST EINTEGRITY > =20 > +#elif !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EIN= TEGRITY) > +#define ENOTRECOVERABLE __elast1 > +#define EOWNERDEAD __elast2 > +#ifdef ELAST > +#undef ELAST > +#define ELAST EOWNERDEAD > + > +#elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EIN= TEGRITY) > #define EOWNERDEAD __elast1 > +#define EINTEGRITY __elast2 > +#ifdef ELAST > +#undef ELAST > +#define ELAST EINTEGRITY > =20 > +#elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && defined(EINT= EGRITY) > +#define EOWNERDEAD __elast1 > #ifdef ELAST > #undef ELAST > #define ELAST EOWNERDEAD > -#endif > =20 > -#elif defined(EOWNERDEAD) > +#elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EIN= TEGRITY) > +#define ENOTRECOVERABLE __elast1 > +#define EINTEGRITY __elast2 > +#ifdef ELAST > +#undef ELAST > +#define ELAST EINTEGRITY > =20 > +#elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINT= EGRITY) > #define ENOTRECOVERABLE __elast1 > #ifdef ELAST > #undef ELAST > #define ELAST ENOTRECOVERABLE > -#endif > =20 > -#else // defined(EOWNERDEAD) > - > -#define EOWNERDEAD __elast1 > -#define ENOTRECOVERABLE __elast2 > +#elif defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINT= EGRITY) > +#define EINTEGRITY __elast1 > #ifdef ELAST > #undef ELAST > -#define ELAST ENOTRECOVERABLE > -#endif > +#define ELAST EINTEGRITY > =20 > -#endif // defined(EOWNERDEAD) > +#endif // !defined(OWNERDEAD) && !defined(NOTRECOVERABLE) && !defined(= INTEGRITY) > =20 > -#endif // !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) > +#endif // !defined(OWNERDEAD) || !defined(NOTRECOVERABLE) || !defined(= INTEGRITY) > =20 > // supply errno values likely to be missing, particularly on Windows > =20 > @@ -391,6 +414,10 @@ static const int __elast2 =3D 105; > =20 > #ifndef EMLINK > #define EMLINK 9979 > +#endif > + > +#ifndef EINTEGRITY > +#define EINTEGRITY 9980 > #endif > =20 > #endif // __cplusplus >=20 The build errors out as Clang complains about all of these conditional directives being unterminated. --- algorithm.o --- In file included from /usr/src/contrib/libc++/src/algorithm.cpp:11: In file included from /usr/src/contrib/libc++/include/random:1646: In file included from /usr/src/contrib/libc++/include/istream:163: In file included from /usr/src/contrib/libc++/include/ostream:138: In file included from /usr/src/contrib/libc++/include/ios:216: In file included from /usr/src/contrib/libc++/include/__locale:18: In file included from /usr/src/contrib/libc++/include/mutex:191: In file included from /usr/src/contrib/libc++/include/__mutex_base:16: In file included from /usr/src/contrib/libc++/include/system_error:146: In file included from /usr/src/contrib/libc++/include/__errc:106: In file included from /usr/src/contrib/libc++/include/cerrno:27: /usr/src/contrib/libc++/include/errno.h:70:2: error: unterminated conditional directive #ifdef ELAST ^ /usr/src/contrib/libc++/include/errno.h:63:2: error: unterminated conditional directive #ifdef ELAST ^ /usr/src/contrib/libc++/include/errno.h:56:2: error: unterminated conditional directive #ifdef ELAST ^ /usr/src/contrib/libc++/include/errno.h:52:2: error: unterminated conditional directive #if !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) ^ /usr/src/contrib/libc++/include/errno.h:36:2: error: unterminated conditional directive #if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) || !defined(EINTEGRITY) ^ /usr/src/contrib/libc++/include/errno.h:34:2: error: unterminated conditional directive #ifdef __cplusplus ^ /usr/src/contrib/libc++/include/errno.h:11:2: error: unterminated conditional directive #ifndef _LIBCPP_ERRNO_H ^ In file included from /usr/src/contrib/libc++/src/algorithm.cpp:11: In file included from /usr/src/contrib/libc++/include/random:1646: In file included from /usr/src/contrib/libc++/include/istream:163: In file included from /usr/src/contrib/libc++/include/ostream:138: In file included from /usr/src/contrib/libc++/include/ios:216: In file included from /usr/src/contrib/libc++/include/__locale:18: In file included from /usr/src/contrib/libc++/include/mutex:191: In file included from /usr/src/contrib/libc++/include/__mutex_base:17: In file included from /usr/src/contrib/libc++/include/__threading_support:16: /usr/src/contrib/libc++/include/errno.h:70:2: error: unterminated conditional directive #ifdef ELAST ^ /usr/src/contrib/libc++/include/errno.h:63:2: error: unterminated conditional directive #ifdef ELAST ^ /usr/src/contrib/libc++/include/errno.h:56:2: error: unterminated conditional directive #ifdef ELAST ^ /usr/src/contrib/libc++/include/errno.h:52:2: error: unterminated conditional directive #if !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) ^ /usr/src/contrib/libc++/include/errno.h:36:2: error: unterminated conditional directive #if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) || !defined(EINTEGRITY) ^ /usr/src/contrib/libc++/include/errno.h:34:2: error: unterminated conditional directive #ifdef __cplusplus ^ /usr/src/contrib/libc++/include/errno.h:11:2: error: unterminated conditional directive #ifndef _LIBCPP_ERRNO_H ^ 14 errors generated. *** [algorithm.o] Error code 1 --=20 Charlie Li Can't think of a witty .sigline today=E2=80=A6 (This email address is for mailing list use only; replace local-part with vishwin for off-list communication) --1McyOKagBQ2yGiA1WxTMzE6saaDEJ8U4b-- --Q2upOuXpe7R55pKKabqPaXmZDRS9SjAAP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE/3/Cqr5a+41PbEb+jnB43vIDq2wFAlxALq8ACgkQjnB43vID q2wxMw/+JnbbIe1+oh92c5TghzCLDTtu1ghOVda2gqsHuuo+pXc4G467/POU/w99 tIOtaeLYZTov9nhDn2gYJ0OQivU++jt10fCfFCy2wRnaWNs2ttygn8hA6TfB3Kxd 05QM3ZoHgX34kkPT+ZDe48ah1iAKOAw5Vnptcdih8ughdEl/49gHLhPOdWHSaDEE ZzXVa66Zx4ci9lr4vsSlKq7RnEBfZZ9Hp1j25R58to8TlmJUUyImbWEFYoqpLx+z 0P01LZxGoYgRdbnE1u32N2Zfutb92qtfb9YOcYRqHKnYO2M2cDF78C96B+DlcJkY rdixlROov+2J8TyhISZimKxnzQciZGbY2JmjRnHlruM50hz3PcXsrEwhQ+PFPxFi uKv7hztuUwtr4a3pn/s1mqQvjDZXVxHNqX1qR41ZyKrqcZF2Cef3FK+APZTnNZ5s 5kRR+S3Ikz+/mAQblJ1csopIn5rAfICJsW7Ax5a0KxT2mrDlsncvVcrZAirbvJVW Q7G7oGPWL4e5DyMRNedF/2xwiuX/Ma3og8P1A8uJNqsmgBDY+tF/wzBAqwLhuWII TrAiCEDgy9uBd7dFb5cpN6ndXhrFC5kxXXNECZx3dfvtDzq37VrQ4qQh7G3pp2mS 5A8QN++fWpdYkVAxLBKVfpTPSqGexIkRc6bOj4B8ursXw4uILqA= =fAUg -----END PGP SIGNATURE----- --Q2upOuXpe7R55pKKabqPaXmZDRS9SjAAP--