import fix to ITS#5172

[openldap] / include / ac / assert.h

diff --git a/include/ac/assert.h b/include/ac/assert.h
index a65e1c0cc2abbc07d83b83126acc6a68414cbb45..30bef2860de60fd2096b62fa09c990335b545a2c 100644 (file)
--- a/include/ac/assert.h
+++ b/include/ac/assert.h
@@ -1,23 +1,33 @@
 /* Generic assert.h */
-/*
- * Copyright 1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * 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 in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_ASSERT_H
 #define _AC_ASSERT_H
 
+#undef assert
+
 #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
 
 /*
@@ -25,17 +35,23 @@
  * create a replacement and hope it works
  */
 
-void   ber_pvt_assert(char* file, int line, char* test);
-#define assert(test) \
-       ((test) \
-               ? (void)0 \
-               : ber_pvt_assert( __FILE__, __LINE__, LDAP_STRING(test)) )
+LBER_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__, #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 */