Index: ossp-pkg/l2/l2.h.in
RCS File: /v/ossp/cvs/ossp-pkg/l2/l2.h.in,v
rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/l2/l2.h.in,v' 2>/dev/null
--- l2.h.in	2001/09/13 16:32:12	1.7
+++ l2.h.in	2001/09/13 19:18:34	1.8
@@ -64,19 +64,6 @@
 #define TRUE (!FALSE)
 #endif
 
-#ifndef DEBUG
-#define ASSERT(expr) ((voir)0)
-#else
-#define ASSERT(expr)\
-        do {\
-            if (!(expr)) {\
-                fprintf(stderr, "Assertion failed in %s line %d! ", __FILE__, __LINE__);\
-                exit(1);\
-            }\
-        }\
-        while (0)
-#endif
-
 /* forward declarations for opaque data structures */
 union  l2_context_un;
 struct l2_param_st;
Index: ossp-pkg/l2/l2_ch_socket.c
RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_socket.c,v
rcsdiff -q -kk '-r1.27' '-r1.28' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_socket.c,v' 2>/dev/null
--- l2_ch_socket.c	2001/09/13 16:19:06	1.27
+++ l2_ch_socket.c	2001/09/13 19:18:34	1.28
@@ -53,7 +53,7 @@
     const char      *pszIndex     = NULL;    /* To index IPv6 validity */
     char            *pszNextfield = "";      /* For IPv6 address trans */
 
-    ASSERT(pvMemref);
+    assert(pvMemref != NULL);
     if (iFamily == AF_INET) {
         if (inet_aton(pszAddress, &IP4Addr)) {
             memcpy(pvMemref, &IP4Addr, sizeof(struct in_addr));
Index: ossp-pkg/l2/l2_p.h
RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_p.h,v
rcsdiff -q -kk '-r1.16' '-r1.17' -u '/v/ossp/cvs/ossp-pkg/l2/l2_p.h,v' 2>/dev/null
--- l2_p.h	2001/09/12 13:50:46	1.16
+++ l2_p.h	2001/09/13 19:18:34	1.17
@@ -33,6 +33,11 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#ifndef DEBUG
+#define NDEBUG
+#endif
+#include <assert.h>
+
 #include "l2.h"
 #include "l2_config.h"
 #include "l2_ut_pcre.h"
Index: ossp-pkg/l2/l2_sockmon.c
RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2_sockmon.c,v
rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/l2/Attic/l2_sockmon.c,v' 2>/dev/null
--- l2_sockmon.c	2001/09/13 16:19:06	1.7
+++ l2_sockmon.c	2001/09/13 19:18:34	1.8
@@ -32,6 +32,7 @@
 #include <netinet/in.h>
 #include <stdio.h>
 #include <errno.h>
+#include <assert.h>
 
 #include "l2.h"
 
@@ -43,7 +44,7 @@
     int  i        = 0;
     char *pszTemp = NULL;
 
-    ASSERT(pszIn);
+    assert(pszIn != NULL);
 
     if ((pszTemp = (char *)strdup(pszIn)) == NULL)
         return NULL;