Date: Thu, 17 Jan 2019 17:16:05 +0100 (CET) From: =?ISO-8859-1?Q?Trond_Endrest=F8l?= <Trond.Endrestol@fagskolen.gjovik.no> To: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: r343111 breaks build Message-ID: <alpine.BSF.2.21.9999.1901171713110.25281@mail.fig.ol.no> In-Reply-To: <alpine.BSF.2.21.9999.1901171547170.25281@mail.fig.ol.no> References: <31f270cd-ea9b-d71b-8e0c-a3ec3386666c@FreeBSD.org> <20190117124908.GL1142@albert.catwhisker.org> <alpine.BSF.2.21.9999.1901171547170.25281@mail.fig.ol.no>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Thu, 17 Jan 2019 15:53+0100, Trond Endrestøl wrote: > Try the attached patch, [...] I fail to see how r343113 actually fixes r343111. Attached patch augments and corrects the changes done in r343113. -- Trond. [-- Attachment #2 --] Index: contrib/libc++/include/errno.h =================================================================== --- contrib/libc++/include/errno.h (revision 343114) +++ contrib/libc++/include/errno.h (working copy) @@ -56,6 +56,7 @@ #if defined(ELAST) #undef ELAST #define ELAST EINTEGRITY +#endif #elif !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 @@ -63,6 +64,7 @@ #if defined(ELAST) #undef ELAST #define ELAST EOWNERDEAD +#endif #elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define EOWNERDEAD __elast1 @@ -70,6 +72,7 @@ #if defined(ELAST) #undef ELAST #define ELAST EINTEGRITY +#endif #elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define EOWNERDEAD __elast1 @@ -76,6 +79,7 @@ #if defined(ELAST) #undef ELAST #define ELAST EOWNERDEAD +#endif #elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 @@ -83,6 +87,7 @@ #if defined(ELAST) #undef ELAST #define ELAST EINTEGRITY +#endif #elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 @@ -89,6 +94,7 @@ #if defined(ELAST) #undef ELAST #define ELAST ENOTRECOVERABLE +#endif #elif defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define EINTEGRITY __elast1 @@ -95,6 +101,7 @@ #if defined(ELAST) #undef ELAST #define ELAST EINTEGRITY +#endif #endif // !defined(OWNERDEAD) && !defined(NOTRECOVERABLE) && !defined(INTEGRITY)help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.21.9999.1901171713110.25281>