summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Innes <andrewi@gnu.org>2001-01-30 18:11:56 +0000
committerAndrew Innes <andrewi@gnu.org>2001-01-30 18:11:56 +0000
commit914d725857ac6cb0c14a55213efe9de07185c53b (patch)
treeb2522aebac2f5e69f51f6b2b1bb733caa1794f89
parentb28e26be4148d218f1f52f972a5f5b8f2d8217a6 (diff)
downloademacs-914d725857ac6cb0c14a55213efe9de07185c53b.tar.gz
(assert) [__MINGW32__]: Redefine assert to work around a
bug in the Mingw32 assert.h header file.
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/etags.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2b5ccb265b0..d7685bfe124 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-30 Andrew Innes <andrewi@gnu.org>
+
+ * etags.c (assert) [__MINGW32__]: Redefine assert to work around a
+ bug in the Mingw32 assert.h header file.
+
2001-01-30 Francesco Potorti` <pot@gnu.org>
* etags.c: [WIN32-NATIVE]: #undef MSDOS, #undef WINDOWSNT and
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 1e1478886b6..e17aefbc557 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -126,6 +126,12 @@ char pot_etags_version[] = "@(#) pot revision number is 14.13";
#include <sys/types.h>
#include <sys/stat.h>
+/* Work around bug in Mingw assert.h. */
+#if defined (__MINGW32__) && defined(NDEBUG) && defined (assert)
+#undef assert
+#define assert(x) ((void) 0)
+#endif
+
#if !defined (S_ISREG) && defined (S_IFREG)
# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
#endif