Module Name: src
Committed By: jym
Date: Sun Sep 25 20:31:18 UTC 2011
Modified Files:
src/sys/lib/libkern: libkern.h
Log Message:
Do as Joerg said and kill the __STDC__ blocks. They only make sense for
things used by assembler, which won't be the case for these macros.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/lib/libkern/libkern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.99 src/sys/lib/libkern/libkern.h:1.100
--- src/sys/lib/libkern/libkern.h:1.99 Thu Sep 1 22:35:17 2011
+++ src/sys/lib/libkern/libkern.h Sun Sep 25 20:31:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.99 2011/09/01 22:35:17 jym Exp $ */
+/* $NetBSD: libkern.h,v 1.100 2011/09/25 20:31:18 jym Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -177,13 +177,8 @@ tolower(int ch)
#ifdef NDEBUG /* tradition! */
#define assert(e) ((void)0)
#else
-#ifdef __STDC__
#define assert(e) (__predict_true((e)) ? (void)0 : \
kern_assert("", __FILE__, __LINE__, #e))
-#else
-#define assert(e) (__predict_true((e)) ? (void)0 : \
- kern_assert("", __FILE__, __LINE__, "e"))
-#endif
#endif
#ifdef __COVERITY__
@@ -209,13 +204,8 @@ tolower(int ch)
if (__predict_false(!(e))) \
panic msg; \
} while (/*CONSTCOND*/ 0)
-#ifdef __STDC__
#define KASSERT(e) (__predict_true((e)) ? (void)0 : \
kern_assert("diagnostic ", __FILE__, __LINE__, #e))
-#else
-#define KASSERT(e) (__predict_true((e)) ? (void)0 : \
- kern_assert("diagnostic ", __FILE__, __LINE__,"e"))
-#endif
#endif
#ifndef DEBUG
@@ -231,13 +221,8 @@ tolower(int ch)
if (__predict_false(!(e))) \
panic msg; \
} while (/*CONSTCOND*/ 0)
-#ifdef __STDC__
#define KDASSERT(e) (__predict_true((e)) ? (void)0 : \
kern_assert("debugging ", __FILE__, __LINE__, #e))
-#else
-#define KDASSERT(e) (__predict_true((e)) ? (void)0 : \
- kern_assert("debugging ", __FILE__, __LINE__, "e"))
-#endif
#endif
/*
* XXX: For compatibility we use SMALL_RANDOM by default.
