X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fassert.c;h=a8fc25b76182bd6d55d01be87512f62024c305d1;hb=d865c4403fc91d1f1ac95ba76febcee9f429bb97;hp=ed56fc60727d61a4639a2f72e1509e16fb98ed2d;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73;p=pdclib

diff --git a/functions/_PDCLIB/assert.c b/functions/_PDCLIB/assert.c
index ed56fc6..a8fc25b 100644
--- a/functions/_PDCLIB/assert.c
+++ b/functions/_PDCLIB/assert.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* _PDCLIB_assert( char const * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -12,31 +10,28 @@
 
 #ifndef REGTEST
 
-#ifndef _PDCLIB_AUX_H
-#define _PDCLIB_AUX_H _PDCLIB_AUX_H
-#include <_PDCLIB_aux.h>
-#endif
+#include "_PDCLIB_aux.h"
 
-#if _PDCLIB_C_VERSION == 99
-void _PDCLIB_assert( char const * const message1, char const * const function, char const * const message2 )
+void _PDCLIB_assert99( char const * const message1, char const * const function, char const * const message2 )
 {
     fputs( message1, stderr );
     fputs( function, stderr );
     fputs( message2, stderr );
     abort();
 }
-#else
-void _PDCLIB_assert( char const * const message )
+
+void _PDCLIB_assert89( char const * const message )
 {
     fputs( message, stderr );
     abort();
 }
-#endif
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+
+#include "_PDCLIB_test.h"
+
 #include <signal.h>
 
 static int EXPECTED_ABORT = 0;
@@ -45,10 +40,11 @@ static int UNEXPECTED_ABORT = 1;
 static void aborthandler( int sig )
 {
     TESTCASE( ! EXPECTED_ABORT );
-    exit( (signed int)rc );
+    exit( (signed int)TEST_RESULTS );
 }
 
 #define NDEBUG
+
 #include <assert.h>
 
 static int disabled_test( void )
@@ -60,6 +56,7 @@ static int disabled_test( void )
 }
 
 #undef NDEBUG
+
 #include <assert.h>
 
 int main( void )