From: Jim Meyering <jim@meyering.net>
Date: Thu, 30 Jun 2005 16:40:59 +0000 (+0000)
Subject: (VERIFY): Guard definition with #ifndef.
X-Git-Tag: CPPI-1_12~439
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9129f0786342c0f650ca782a10ebd676c266cfe;p=thirdparty%2Fcoreutils.git

(VERIFY): Guard definition with #ifndef.
(VERIFY_EXPR): Undef before defining.
---

diff --git a/src/system.h b/src/system.h
index fbaeefe18b..b5caf0d06e 100644
--- a/src/system.h
+++ b/src/system.h
@@ -812,15 +812,18 @@ ptr_align (void const *ptr, size_t alignment)
   return (void *) (p1 - (size_t) p1 % alignment);
 }
 
-#define GL_CONCAT0(x, y) x##y
-#define GL_CONCAT(x, y) GL_CONCAT0 (x, y)
+#ifndef VERIFY
+# define GL_CONCAT0(x, y) x##y
+# define GL_CONCAT(x, y) GL_CONCAT0 (x, y)
 /* Verify a requirement at compile-time (unlike assert, which is runtime).  */
-#define VERIFY(assertion) \
-  struct GL_CONCAT (compile_time_assert_, __LINE__) \
-    { char a[(assertion) ? 1 : -1]; }
+# define VERIFY(assertion) \
+   struct GL_CONCAT (compile_time_assert_, __LINE__) \
+     { char a[(assertion) ? 1 : -1]; }
+#endif
 
 /* Like the above, but use an expression rather than a struct declaration.
    This macro may be used in some contexts where the other may not.  */
+#undef VERIFY_EXPR
 #define VERIFY_EXPR(assertion) \
   (void)((struct {char a[(assertion) ? 1 : -1]; } *) 0)