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)