headers: remove definition of ASSERT from xfs.h

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@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in
index 30dd7a4730b992d95b586595c04c2f577409aee0..f4e4261aa4cde0f46800817beca46e116850132e 100644 (file)
--- 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 bc940685e03c45f8a4194bf55af73e079c0a98ef..7bed9573397424d41c8dd6699bbf200d6162b5d8 100644 (file)
--- 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
  */