Add "extern C {...} to header files for C++ builds.

[freeradius.git] / src / include / rad_assert.h

diff --git a/src/include/rad_assert.h b/src/include/rad_assert.h
index e477c32..a0b513b 100644 (file)
--- a/src/include/rad_assert.h
+++ b/src/include/rad_assert.h
@@ -25,14 +25,27 @@
 #include <freeradius-devel/ident.h>
 RCSIDH(rad_assert_h, "$Id$")
 
-extern void rad_assert_fail (const char *file, unsigned int line);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void rad_assert_fail (const char *file, unsigned int line, const char *expr);
 
 #ifdef NDEBUG
        #define rad_assert(expr) ((void) (0))
-#else
+
+#elif !defined(FR_SCAN_BUILD)
        #define rad_assert(expr) \
-               ((void) ((expr) ? 0 : \
-                       rad_assert_fail (__FILE__, __LINE__)))
+               ((void) ((expr) ? (void) 0 : \
+                       (void) rad_assert_fail (__FILE__, __LINE__, #expr)))
+
+#else
+#include <assert.h>
+#define rad_assert assert
+#endif
+
+#ifdef __cplusplus
+}
 #endif
 
 #endif