* make-docfile.c (EMACS_INTEGER): Rename from EMACS_INT.

This commit is contained in:
Paul Eggert 2011-02-08 16:30:33 -08:00
parent bfcb151a96
commit 64df8c1098
2 changed files with 9 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2011-02-09 Paul Eggert <eggert@cs.ucla.edu>
* 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 <tromey@redhat.com>
* make-docfile.c: Unconditionally include stdlib.h.

View file

@ -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')