[PATCH] headers: remove definition of ASSERT from xfs.h
Dave Chinner
david at fromorbit.com
Thu Oct 15 18:46:54 CDT 2015
From: Dave Chinner <dchinner at redhat.com>
If we define ASSERT() in the installed xfs.h header file, programs
including this header file will have their local definitions of
ASSERT screwed up. This is something internal to the xfsprogs build,
so move it to platform_defs.h.in where it will no longer be public.
Signed-off-by: Dave Chinner <dchinner at redhat.com>
---
include/platform_defs.h.in | 6 ++++++
include/xfs.h | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in
index 30dd7a4..f4e4261 100644
--- a/include/platform_defs.h.in
+++ b/include/platform_defs.h.in
@@ -83,4 +83,10 @@ typedef unsigned short umode_t;
#define NBBY 8
#endif
+#ifdef DEBUG
+# define ASSERT(EX) assert(EX)
+#else
+# define ASSERT(EX) ((void) 0)
+#endif
+
#endif /* __XFS_PLATFORM_DEFS_H__ */
diff --git a/include/xfs.h b/include/xfs.h
index bc94068..7bed957 100644
--- a/include/xfs.h
+++ b/include/xfs.h
@@ -47,12 +47,6 @@
# error unknown platform... have fun porting!
#endif
-#ifdef DEBUG
-# define ASSERT(EX) assert(EX)
-#else
-# define ASSERT(EX) ((void) 0)
-#endif
-
/*
* sparse kernel source annotations
*/
--
2.5.0
More information about the xfs
mailing list