Move assert.h include to util.h

In util.h, define NDEBUG if not running lint.

svn path=/trunk/yasm/; revision=385

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index e4e3d7874fabadd92663737b377396360d228475..e78e1dfddabfc3b3f5f8a90884327b455a8a5d13 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -22,10 +22,6 @@
 #include "util.h"
 /*@unused@*/ RCSID("$IdPath$");
 
-#ifdef STDC_HEADERS
-# include <assert.h>
-#endif
-
 #include "bitvect.h"
 #include "file.h"
 

diff --git a/libyasm/errwarn.c b/libyasm/errwarn.c
index c0f44d4039bce88b030868b6c8352486b29eb12f..daf412cfd44f0953a223ddf1cbacecdf74d16b83 100644 (file)
--- a/libyasm/errwarn.c
+++ b/libyasm/errwarn.c
@@ -26,7 +26,6 @@
 
 #ifdef STDC_HEADERS
 # include <stdarg.h>
-# include <assert.h>
 #endif
 
 #ifdef gettext_noop

diff --git a/libyasm/section.c b/libyasm/section.c
index 07768922c1ac49a57ba3c086c63874d494a336d3..b791f9d9905a424647b114657abb647f8d193a62 100644 (file)
--- a/libyasm/section.c
+++ b/libyasm/section.c
@@ -22,10 +22,6 @@
 #include "util.h"
 /*@unused@*/ RCSID("$IdPath$");
 
-#ifdef STDC_HEADERS
-# include <assert.h>
-#endif
-
 #include "globals.h"
 #include "errwarn.h"
 #include "expr.h"

diff --git a/libyasm/symrec.c b/libyasm/symrec.c
index 867e8c4860afc4feacac6cb818e45ed657d59ac5..e88d5e7b3ced07d1299424ffd26a389a35c9b6f7 100644 (file)
--- a/libyasm/symrec.c
+++ b/libyasm/symrec.c
@@ -23,7 +23,6 @@
 /*@unused@*/ RCSID("$IdPath$");
 
 #ifdef STDC_HEADERS
-# include <assert.h>
 # include <limits.h>
 #endif
 

diff --git a/libyasm/util.h b/libyasm/util.h
index 70a634533f3b0299328802d538819aa715c98ea6..50b6a3108d8f8aba8d24cac53eebfcd25b49064e 100644 (file)
--- a/libyasm/util.h
+++ b/libyasm/util.h
@@ -30,10 +30,15 @@
 
 #include <stdio.h>
 
+#if !defined(lint)
+# define NDEBUG
+#endif
+
 #ifdef STDC_HEADERS
 # include <stddef.h>
 # include <stdlib.h>
 # include <string.h>
+# include <assert.h>
 #endif
 
 #if defined(lint)

diff --git a/modules/arch/x86/expr.c b/modules/arch/x86/expr.c
index 36702c92114219e3764684805d7d53027dafc1d3..09b217672199a9ce5b5123def75f08ab2e3941b5 100644 (file)
--- a/modules/arch/x86/expr.c
+++ b/modules/arch/x86/expr.c
@@ -22,10 +22,6 @@
 #include "util.h"
 /*@unused@*/ RCSID("$IdPath$");
 
-#ifdef STDC_HEADERS
-# include <assert.h>
-#endif
-
 #include "bitvect.h"
 
 #include "globals.h"

diff --git a/modules/arch/x86/x86expr.c b/modules/arch/x86/x86expr.c
index 36702c92114219e3764684805d7d53027dafc1d3..09b217672199a9ce5b5123def75f08ab2e3941b5 100644 (file)
--- a/modules/arch/x86/x86expr.c
+++ b/modules/arch/x86/x86expr.c
@@ -22,10 +22,6 @@
 #include "util.h"
 /*@unused@*/ RCSID("$IdPath$");
 
-#ifdef STDC_HEADERS
-# include <assert.h>
-#endif
-
 #include "bitvect.h"
 
 #include "globals.h"

diff --git a/modules/parsers/nasm/bison.y.in b/modules/parsers/nasm/bison.y.in
index d235ee0be007b6bce931db9d20d52569ddbdd2b5..729a963334a86e4f8c25abf6fd1503c842dcd316 100644 (file)
--- a/modules/parsers/nasm/bison.y.in
+++ b/modules/parsers/nasm/bison.y.in
@@ -24,7 +24,6 @@
 RCSID("$IdPath$");
 
 #ifdef STDC_HEADERS
-# include <assert.h>
 # include <math.h>
 #endif
 

diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y
index d235ee0be007b6bce931db9d20d52569ddbdd2b5..729a963334a86e4f8c25abf6fd1503c842dcd316 100644 (file)
--- a/modules/parsers/nasm/nasm-bison.y
+++ b/modules/parsers/nasm/nasm-bison.y
@@ -24,7 +24,6 @@
 RCSID("$IdPath$");
 
 #ifdef STDC_HEADERS
-# include <assert.h>
 # include <math.h>
 #endif
 

diff --git a/src/arch/x86/expr.c b/src/arch/x86/expr.c
index 36702c92114219e3764684805d7d53027dafc1d3..09b217672199a9ce5b5123def75f08ab2e3941b5 100644 (file)
--- a/src/arch/x86/expr.c
+++ b/src/arch/x86/expr.c
@@ -22,10 +22,6 @@
 #include "util.h"
 /*@unused@*/ RCSID("$IdPath$");
 
-#ifdef STDC_HEADERS
-# include <assert.h>
-#endif
-
 #include "bitvect.h"
 
 #include "globals.h"

diff --git a/src/arch/x86/x86expr.c b/src/arch/x86/x86expr.c
index 36702c92114219e3764684805d7d53027dafc1d3..09b217672199a9ce5b5123def75f08ab2e3941b5 100644 (file)
--- a/src/arch/x86/x86expr.c
+++ b/src/arch/x86/x86expr.c
@@ -22,10 +22,6 @@
 #include "util.h"
 /*@unused@*/ RCSID("$IdPath$");
 
-#ifdef STDC_HEADERS
-# include <assert.h>
-#endif
-
 #include "bitvect.h"
 
 #include "globals.h"

diff --git a/src/errwarn.c b/src/errwarn.c
index c0f44d4039bce88b030868b6c8352486b29eb12f..daf412cfd44f0953a223ddf1cbacecdf74d16b83 100644 (file)
--- a/src/errwarn.c
+++ b/src/errwarn.c
@@ -26,7 +26,6 @@
 
 #ifdef STDC_HEADERS
 # include <stdarg.h>
-# include <assert.h>
 #endif
 
 #ifdef gettext_noop

diff --git a/src/main.c b/src/main.c
index e4e3d7874fabadd92663737b377396360d228475..e78e1dfddabfc3b3f5f8a90884327b455a8a5d13 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -22,10 +22,6 @@
 #include "util.h"
 /*@unused@*/ RCSID("$IdPath$");
 
-#ifdef STDC_HEADERS
-# include <assert.h>
-#endif
-
 #include "bitvect.h"
 #include "file.h"
 

diff --git a/src/parsers/nasm/bison.y.in b/src/parsers/nasm/bison.y.in
index d235ee0be007b6bce931db9d20d52569ddbdd2b5..729a963334a86e4f8c25abf6fd1503c842dcd316 100644 (file)
--- a/src/parsers/nasm/bison.y.in
+++ b/src/parsers/nasm/bison.y.in
@@ -24,7 +24,6 @@
 RCSID("$IdPath$");
 
 #ifdef STDC_HEADERS
-# include <assert.h>
 # include <math.h>
 #endif
 

diff --git a/src/parsers/nasm/nasm-bison.y b/src/parsers/nasm/nasm-bison.y
index d235ee0be007b6bce931db9d20d52569ddbdd2b5..729a963334a86e4f8c25abf6fd1503c842dcd316 100644 (file)
--- a/src/parsers/nasm/nasm-bison.y
+++ b/src/parsers/nasm/nasm-bison.y
@@ -24,7 +24,6 @@
 RCSID("$IdPath$");
 
 #ifdef STDC_HEADERS
-# include <assert.h>
 # include <math.h>
 #endif
 

diff --git a/src/section.c b/src/section.c
index 07768922c1ac49a57ba3c086c63874d494a336d3..b791f9d9905a424647b114657abb647f8d193a62 100644 (file)
--- a/src/section.c
+++ b/src/section.c
@@ -22,10 +22,6 @@
 #include "util.h"
 /*@unused@*/ RCSID("$IdPath$");
 
-#ifdef STDC_HEADERS
-# include <assert.h>
-#endif
-
 #include "globals.h"
 #include "errwarn.h"
 #include "expr.h"

diff --git a/src/symrec.c b/src/symrec.c
index 867e8c4860afc4feacac6cb818e45ed657d59ac5..e88d5e7b3ced07d1299424ffd26a389a35c9b6f7 100644 (file)
--- a/src/symrec.c
+++ b/src/symrec.c
@@ -23,7 +23,6 @@
 /*@unused@*/ RCSID("$IdPath$");
 
 #ifdef STDC_HEADERS
-# include <assert.h>
 # include <limits.h>
 #endif
 

diff --git a/src/util.h b/src/util.h
index 70a634533f3b0299328802d538819aa715c98ea6..50b6a3108d8f8aba8d24cac53eebfcd25b49064e 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -30,10 +30,15 @@
 
 #include <stdio.h>
 
+#if !defined(lint)
+# define NDEBUG
+#endif
+
 #ifdef STDC_HEADERS
 # include <stddef.h>
 # include <stdlib.h>
 # include <string.h>
+# include <assert.h>
 #endif
 
 #if defined(lint)

diff --git a/util.h b/util.h
index 70a634533f3b0299328802d538819aa715c98ea6..50b6a3108d8f8aba8d24cac53eebfcd25b49064e 100644 (file)
--- a/util.h
+++ b/util.h
@@ -30,10 +30,15 @@
 
 #include <stdio.h>
 
+#if !defined(lint)
+# define NDEBUG
+#endif
+
 #ifdef STDC_HEADERS
 # include <stddef.h>
 # include <stdlib.h>
 # include <string.h>
+# include <assert.h>
 #endif
 
 #if defined(lint)