diff options
| author | Francesco Potortì <pot@gnu.org> | 2001-01-31 08:53:56 +0000 |
|---|---|---|
| committer | Francesco Potortì <pot@gnu.org> | 2001-01-31 08:53:56 +0000 |
| commit | 8f79fe7269e1cae1fb6e63a4d5943da36ee22fc3 (patch) | |
| tree | 81087d3ecf428dac31903a698174fd38dad16d10 /lib-src | |
| parent | dbd98b197f3161054b61d4452d6356cda9c71f9c (diff) | |
| download | emacs-8f79fe7269e1cae1fb6e63a4d5943da36ee22fc3.tar.gz | |
Work around small preprocessor bugs in sunos4 pcc and MinGW.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 8 | ||||
| -rw-r--r-- | lib-src/etags.c | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index d7685bfe124..9691dddf9fd 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -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 diff --git a/lib-src/etags.c b/lib-src/etags.c index e17aefbc557..2071fb52b2f 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -32,7 +32,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ * 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 @@ char pot_etags_version[] = "@(#) pot revision number is 14.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 @@ C_entries (c_ext, inf) lp += 2; toklen += 2; c = lp[-1]; - goto intoken; + goto still_in_token; } else { @@ -3105,7 +3104,7 @@ C_entries (c_ext, inf) } } /* if (endtoken (c)) */ else if (intoken (c)) - intoken: + still_in_token: { toklen++; continue; |