X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fwirehdr.c;h=7fc30bfa7347c0ca9f5c4e28183663296e8c15af;hp=49c732b66c4bbd2009918c6f9f11eaab1155b793;hb=da1d93513fdff0a70257b13aa5649e478d4f70b6;hpb=66172e3274ca3187edd519dd87a81a478a6d7259

diff --git a/lustre/utils/wirehdr.c b/lustre/utils/wirehdr.c
index 49c732b..7fc30bf 100644
--- a/lustre/utils/wirehdr.c
+++ b/lustre/utils/wirehdr.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #include <errno.h>
@@ -36,8 +35,8 @@
 #include <string.h>
 
 #include <linux/lustre/lustre_idl.h>
-#include <linux/lustre/lustre_access_log.h>
 #ifdef HAVE_SERVER_SUPPORT
+#include <linux/lustre/lustre_access_log.h>
 #include <linux/lustre/lustre_lfsck_user.h>
 #include <linux/lustre/lustre_disk.h>
 #ifdef CONFIG_FS_POSIX_ACL
@@ -49,21 +48,15 @@
 #endif /* CONFIG_FS_POSIX_ACL */
 #endif /* HAVE_SERVER_SUPPORT */
 #include <linux/lustre/lustre_cfg.h>
+#include <lustre/lustreapi.h>
 
-#define LASSERT(cond) if (!(cond)) { printf("failed " #cond "\n"); ret = 1; }
-#define LASSERTF(cond, fmt, ...) if (!(cond)) { printf("failed '" #cond "'" fmt, ## __VA_ARGS__); ret = 1; }
-/*
- * BUILD_BUG_ON() is Compile-time LASSERT, which verifies correctness at
- * compile-time rather than runtime. If "cond" is true, then there are two
- * identical cases ("0" and "0"), which is an error that causes the compiler to
- * complain. If "cond" is false, then there are two different cases
- * ("(non-zero)" and "0").
- *
- */
 #ifndef BUILD_BUG_ON
-#define BUILD_BUG_ON(cond) do {switch (0) {case (cond): case 1: break; } } while (0)
+#define BUILD_BUG_ON(cond) ((void)sizeof(char[1 - 2*!!(cond)]))
 #endif
 
+#define LASSERT(cond) if (!(cond)) { printf("failed " #cond "\n"); ret = 1; }
+#define LASSERTF(cond, fmt, ...) if (!(cond)) { printf("failed '" #cond "'" fmt, ## __VA_ARGS__); ret = 1; }
+
 int ret;
 
 void lustre_assert_wire_constants(void);