Mercurial > emacs
changeset 35758:aa069bbee4c8
Work around small preprocessor bugs in sunos4 pcc and MinGW.
| author | Francesco Potortì <pot@gnu.org> |
|---|---|
| date | Wed, 31 Jan 2001 08:53:56 +0000 |
| parents | 4550a38f48e5 |
| children | 952c61f346ff |
| files | lib-src/ChangeLog lib-src/etags.c |
| diffstat | 2 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Wed Jan 31 08:32:22 2001 +0000 +++ b/lib-src/ChangeLog Wed Jan 31 08:53:56 2001 +0000 @@ -1,3 +1,11 @@ +2001-01-31 Francesco Potorti` <pot@gnu.org> + + * etags.c: [NDEBUG] #undef assert and #define it as ((void)0), for + the sake of some buggy assert.h (e.g. in MinGW and sunos4 pcc). + (C_entries): Tag token renamed to still_in_token because sunos4 + pcc wants to expand it as the token() macro even though it has no + arguments. + 2001-01-30 Andrew Innes <andrewi@gnu.org> * etags.c (assert) [__MINGW32__]: Redefine assert to work around a
--- a/lib-src/etags.c Wed Jan 31 08:32:22 2001 +0000 +++ b/lib-src/etags.c Wed Jan 31 08:53:56 2001 +0000 @@ -32,7 +32,7 @@ * Francesco Potort́ <pot@gnu.org> has maintained it since 1993. */ -char pot_etags_version[] = "@(#) pot revision number is 14.13"; +char pot_etags_version[] = "@(#) pot revision number is $Revision: 14.14 $"; #define TRUE 1 #define FALSE 0 @@ -122,14 +122,13 @@ #ifndef errno extern int errno; #endif -#include <assert.h> #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) +#include <assert.h> +#ifdef NDEBUG +# undef assert /* some systems have a buggy assert.h */ +# define assert(x) ((void) 0) #endif #if !defined (S_ISREG) && defined (S_IFREG) @@ -2983,7 +2982,7 @@ lp += 2; toklen += 2; c = lp[-1]; - goto intoken; + goto still_in_token; } else { @@ -3105,7 +3104,7 @@ } } /* if (endtoken (c)) */ else if (intoken (c)) - intoken: + still_in_token: { toklen++; continue;