summaryrefslogtreecommitdiff
path: root/fs/xfs/support/debug.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 02:51:18 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 02:51:18 (GMT)
commit2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (patch)
tree25b8fc041b4dce6c404ff01b462bc6b58fa7d372 /fs/xfs/support/debug.h
parent990a8baf568ca1d0ae65e59783ff821794118d07 (diff)
parente1a40fa907498030b6e432c0dbcb06d7a9f14ee3 (diff)
downloadlinux-fsl-qoriq-2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e.tar.xz
Merge rsync://oss.sgi.com/git/xfs-2.6
Diffstat (limited to 'fs/xfs/support/debug.h')
-rw-r--r--fs/xfs/support/debug.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h
index 40b0f4c..c5b9365 100644
--- a/fs/xfs/support/debug.h
+++ b/fs/xfs/support/debug.h
@@ -50,16 +50,11 @@ extern void cmn_err(int, char *, ...);
#endif
#ifdef DEBUG
-# ifdef lint
-# define ASSERT(EX) ((void)0) /* avoid "constant in conditional" babble */
-# else
-# define ASSERT(EX) ((!doass||(EX))?((void)0):assfail(#EX, __FILE__, __LINE__))
-# endif /* lint */
+# define ASSERT(EX) ((EX) ? ((void)0) : assfail(#EX, __FILE__, __LINE__))
#else
# define ASSERT(x) ((void)0)
#endif
-extern int doass; /* dynamically turn off asserts */
extern void assfail(char *, char *, int);
#ifdef DEBUG
extern unsigned long random(void);