svn commit: r343115 - head/contrib/libc++/include
Kirk McKusick
mckusick at FreeBSD.org
Thu Jan 17 16:27:01 UTC 2019
Author: mckusick
Date: Thu Jan 17 16:26:59 2019
New Revision: 343115
URL: https://svnweb.freebsd.org/changeset/base/343115
Log:
Truely 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 15:42:10 2019 (r343114)
+++ head/contrib/libc++/include/errno.h Thu Jan 17 16:26:59 2019 (r343115)
@@ -56,6 +56,7 @@ static const int __elast3 = 106;
#if defined(ELAST)
#undef ELAST
#define ELAST EINTEGRITY
+#endif
#elif !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY)
#define ENOTRECOVERABLE __elast1
@@ -63,6 +64,7 @@ static const int __elast3 = 106;
#if defined(ELAST)
#undef ELAST
#define ELAST EOWNERDEAD
+#endif
#elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY)
#define EOWNERDEAD __elast1
@@ -70,12 +72,14 @@ static const int __elast3 = 106;
#if defined(ELAST)
#undef ELAST
#define ELAST EINTEGRITY
+#endif
#elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && defined(EINTEGRITY)
#define EOWNERDEAD __elast1
#if defined(ELAST)
#undef ELAST
#define ELAST EOWNERDEAD
+#endif
#elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY)
#define ENOTRECOVERABLE __elast1
@@ -83,18 +87,21 @@ static const int __elast3 = 106;
#if defined(ELAST)
#undef ELAST
#define ELAST EINTEGRITY
+#endif
#elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY)
#define ENOTRECOVERABLE __elast1
#if defined(ELAST)
#undef ELAST
#define ELAST ENOTRECOVERABLE
+#endif
#elif defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY)
#define EINTEGRITY __elast1
#if defined(ELAST)
#undef ELAST
#define ELAST EINTEGRITY
+#endif
#endif // !defined(OWNERDEAD) && !defined(NOTRECOVERABLE) && !defined(INTEGRITY)
More information about the svn-src-all
mailing list