From 64df8c10985095b9fe15b622da41cd45de8b9261 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 8 Feb 2011 16:30:33 -0800 Subject: [PATCH] * make-docfile.c (EMACS_INTEGER): Rename from EMACS_INT. --- lib-src/ChangeLog | 6 ++++++ lib-src/make-docfile.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 40f6958703..0f93941151 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2011-02-09 Paul Eggert + + * make-docfile.c (EMACS_INTEGER): Rename from EMACS_INT. + This avoids collision with config.h's EMACS_INT on some + configurations. All uses changed. + 2011-02-08 Tom Tromey * make-docfile.c: Unconditionally include stdlib.h. diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 6ce0b886ab..93994c1ed3 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -558,7 +558,7 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs) /* The types of globals. */ enum global_type { - EMACS_INT, + EMACS_INTEGER, BOOLEAN, LISP_OBJECT, INVALID @@ -621,7 +621,7 @@ write_globals (void) switch (globals[i].type) { - case EMACS_INT: + case EMACS_INTEGER: type = "EMACS_INT"; break; case BOOLEAN: @@ -733,7 +733,7 @@ scan_c_file (char *filename, const char *mode) if (generate_globals) { if (c == 'I') - type = EMACS_INT; + type = EMACS_INTEGER; else if (c == 'L') type = LISP_OBJECT; else if (c == 'B') -- 2.20.1