Date: Thu, 17 Jan 2019 02:28:42 -0500 From: Charlie Li <ml@vishwin.info> To: Kirk McKusick <mckusick@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org 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... Message-ID: <ab7c052e-3440-252c-ec92-e8128b203d54@vishwin.info> In-Reply-To: <201901170635.x0H6ZjEs003767@repo.freebsd.org> References: <201901170635.x0H6ZjEs003767@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Q2upOuXpe7R55pKKabqPaXmZDRS9SjAAP Content-Type: multipart/mixed; boundary="1McyOKagBQ2yGiA1WxTMzE6saaDEJ8U4b"; protected-headers="v1" From: Charlie Li <ml@vishwin.info> To: Kirk McKusick <mckusick@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <ab7c052e-3440-252c-ec92-e8128b203d54@vishwin.info> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ab7c052e-3440-252c-ec92-e8128b203d54>