X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fac%2Fassert.h;h=c8155dd832c5a7ab26965be105a1d9d772486b2d;hb=ca4764ccfa656cf23658182a60bc3af5a6d91f1a;hp=48adc864cc4d67ed737f4cd658306f92d5ed0c7e;hpb=12ed7e46ef97df8bc628c48eb6bbd121db95d2b2;p=openldap

diff --git a/include/ac/assert.h b/include/ac/assert.h
index 48adc864cc..c8155dd832 100644
--- a/include/ac/assert.h
+++ b/include/ac/assert.h
@@ -1,12 +1,14 @@
 /* Generic assert.h */
+/* $OpenLDAP$ */
 /*
- * Copyright 1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 
 #ifndef _AC_ASSERT_H
@@ -17,9 +19,12 @@
 #ifdef LDAP_DEBUG
 
 #if defined( HAVE_ASSERT_H ) || defined( STDC_HEADERS )
+
 #undef NDEBUG
 #include <assert.h>
-#else
+
+#else /* !(HAVE_ASSERT_H || STDC_HEADERS) */
+
 #define LDAP_NEED_ASSERT 1
 
 /*
@@ -27,19 +32,23 @@
  * create a replacement and hope it works
  */
 
-LDAP_F(void) ber_pvt_assert LDAP_F((
-	char* file, int line, char* test));
+LIBLBER_F (void) ber_pvt_assert LDAP_P(( const char *file, int line,
+					 const char *test ));
 
+/* Can't use LDAP_STRING(test), that'd expand to "test" */
+#if defined(__STDC__) || defined(__cplusplus)
 #define assert(test) \
-	((test) \
-		? (void)0 \
-		: ber_pvt_assert( __FILE__, __LINE__, LDAP_STRING(test)) )
-
+	((test) ? (void)0 : ber_pvt_assert( __FILE__, __LINE__, #test ) )
+#else
+#define assert(test) \
+	((test) ? (void)0 : ber_pvt_assert( __FILE__, __LINE__, "test" ) )
 #endif
 
-#else
+#endif /* (HAVE_ASSERT_H || STDC_HEADERS) */
+
+#else /* !LDAP_DEBUG */
 /* no asserts */
 #define assert(test) ((void)0)
-#endif
+#endif /* LDAP_DEBUG */
 
 #endif /* _AC_ASSERT_H */