X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Fassert.h;h=c6054e916ec0cf68efb16aa67f4cf4fa6d8837dd;hb=56bacb39160e13397fde32a36329461f3ae56ec1;hp=35c2795352bba439b21e4e391c73864a090b5613;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73;p=pdclib

diff --git a/includes/assert.h b/includes/assert.h
index 35c2795..c6054e9 100644
--- a/includes/assert.h
+++ b/includes/assert.h
@@ -1,28 +1,15 @@
-/* $Id$ */
-
-/* 7.2 Diagnostics <assert.h>
+/* Diagnostics <assert.h>
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#ifndef _PDCLIB_AUX_H
-#define _PDCLIB_AUX_H _PDCLIB_AUX_H
 #include <_PDCLIB_aux.h>
-#endif
-
-#ifndef _PDCLIB_CONFIG_H
-#define _PDCLIB_CONFIG_H _PDCLIB_CONFIG_H
-#include <_PDCLIB_config.h>
-#endif
 
 #ifndef _PDCLIB_ASSERT_H
 #define _PDCLIB_ASSERT_H _PDCLIB_ASSERT_H
-#if _PDCLIB_C_VERSION == 99
-void _PDCLIB_assert( char const * const, char const * const, char const * const );
-#else
-void _PDCLIB_assert( char const * const );
-#endif
+void _PDCLIB_assert99( char const * const, char const * const, char const * const );
+void _PDCLIB_assert89( char const * const );
 #endif
 
 /* If NDEBUG is set, assert() is a null operation. */
@@ -31,19 +18,18 @@ void _PDCLIB_assert( char const * const );
 #ifdef NDEBUG
 #define assert( ignore ) ( (void) 0 )
 #else
-#if _PDCLIB_C_VERSION == 99
+#if __STDC_VERSION__ >= 199901L
 #define assert( expression ) ( ( expression ) ? (void) 0 \
-        : _PDCLIB_assert( "Assertion failed: " #expression \
-                          ", function ", __func__, \
-			  ", file " __FILE__ \
-			  ", line " _PDCLIB_symbol2string( __LINE__ ) \
-			  "." _PDCLIB_endl ) )
+        : _PDCLIB_assert99( "Assertion failed: " #expression \
+                            ", function ", __func__, \
+                            ", file " __FILE__ \
+                            ", line " _PDCLIB_symbol2string( __LINE__ ) \
+                            "." _PDCLIB_endl ) )
 #else
 #define assert( expression ) ( ( expression ) ? (void) 0 \
-	: _PDCLIB_assert( "Assertion failed: " #expression \
-	                  ", file " __FILE__ \
-	                  ", line " _PDCLIB_symbol2string( __LINE__ ) \
-	                  "." _PDCLIB_endl ) )
+        : _PDCLIB_assert89( "Assertion failed: " #expression \
+                            ", file " __FILE__ \
+                            ", line " _PDCLIB_symbol2string( __LINE__ ) \
+                            "." _PDCLIB_endl ) )
 #endif
 #endif
-