Fix use and decl of ber_pvt_assert. Fix ac/stdio.h -> stdio.h.

diff --git a/include/ac/assert.h b/include/ac/assert.h
index 48adc864cc4d67ed737f4cd658306f92d5ed0c7e..82345c7da79eb275163d8e7f49c4d3154e50221f 100644 (file)
--- a/include/ac/assert.h
+++ b/include/ac/assert.h
@@ -17,9 +17,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 +30,23 @@
  * create a replacement and hope it works
  */
 
-LDAP_F(void) ber_pvt_assert LDAP_F((
+LDAP_F(void) ber_pvt_assert LDAP_P((
        char* file, int line, 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 */

diff --git a/libraries/liblber/assert.c b/libraries/liblber/assert.c
index d61306d29f8cf34b53e36497ccab3f9c23295076..ce8f4b8cc8f80fc70af25024edcc7912108c0ad1 100644 (file)
--- a/libraries/liblber/assert.c
+++ b/libraries/liblber/assert.c
@@ -12,7 +12,7 @@
 
 #ifdef LDAP_NEED_ASSERT
 
-#include <ac/stdio.h>
+#include <stdio.h>
 
 /*
  * helper for our private assert() macro
@@ -22,7 +22,8 @@
  * issue for now.
  */
 
-void ber_pvt_assert(char* file, int line, char* test)
+void
+ber_pvt_assert( LDAP_CONST char *file, int line, LDAP_CONST char *test )
 {
        fprintf(stderr,
                "Assertion failed: %s, file %s, line %d\n",