aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorAndrew Innes2001-01-30 18:11:56 +0000
committerAndrew Innes2001-01-30 18:11:56 +0000
commit914d725857ac6cb0c14a55213efe9de07185c53b (patch)
treeb2522aebac2f5e69f51f6b2b1bb733caa1794f89 /lib-src
parentb28e26be4148d218f1f52f972a5f5b8f2d8217a6 (diff)
downloademacs-914d725857ac6cb0c14a55213efe9de07185c53b.tar.gz
emacs-914d725857ac6cb0c14a55213efe9de07185c53b.zip
(assert) [__MINGW32__]: Redefine assert to work around a
bug in the Mingw32 assert.h header file.
Diffstat (limited to 'lib-src')
-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 @@
12001-01-30 Andrew Innes <andrewi@gnu.org>
2
3 * etags.c (assert) [__MINGW32__]: Redefine assert to work around a
4 bug in the Mingw32 assert.h header file.
5
12001-01-30 Francesco Potorti` <pot@gnu.org> 62001-01-30 Francesco Potorti` <pot@gnu.org>
2 7
3 * etags.c: [WIN32-NATIVE]: #undef MSDOS, #undef WINDOWSNT and 8 * 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";
126#include <sys/types.h> 126#include <sys/types.h>
127#include <sys/stat.h> 127#include <sys/stat.h>
128 128
129/* Work around bug in Mingw assert.h. */
130#if defined (__MINGW32__) && defined(NDEBUG) && defined (assert)
131#undef assert
132#define assert(x) ((void) 0)
133#endif
134
129#if !defined (S_ISREG) && defined (S_IFREG) 135#if !defined (S_ISREG) && defined (S_IFREG)
130# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) 136# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
131#endif 137#endif