[Emacs-diffs] /srv/bzr/emacs/trunk r103192: * make-docfile.c (EMACS_INTEGER): Rename from EMACS_INT.

[Paul Eggert]

------------------------------------------------------------
revno: 103192
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-08 16:30:33 -0800
message:
  * make-docfile.c (EMACS_INTEGER): Rename from EMACS_INT.
modified:
  lib-src/ChangeLog
  lib-src/make-docfile.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-02-08 21:42:56 +0000
+++ b/lib-src/ChangeLog 2011-02-09 00:30:33 +0000
@@ -1,3 +1,9 @@
+2011-02-09  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * make-docfile.c: Unconditionally include stdlib.h.

=== modified file 'lib-src/make-docfile.c'
--- a/lib-src/make-docfile.c    2011-02-08 21:42:56 +0000
+++ b/lib-src/make-docfile.c    2011-02-09 00:30:33 +0000
@@ -558,7 +558,7 @@
 /* The types of globals.  */
 enum global_type
 {
-  EMACS_INT,
+  EMACS_INTEGER,
   BOOLEAN,
   LISP_OBJECT,
   INVALID
@@ -621,7 +621,7 @@
 
       switch (globals[i].type)
        {
-       case EMACS_INT:
+       case EMACS_INTEGER:
          type = "EMACS_INT";
          break;
        case BOOLEAN:
@@ -733,7 +733,7 @@
          if (generate_globals)
            {
              if (c == 'I')
-               type = EMACS_INT;
+               type = EMACS_INTEGER;
              else if (c == 'L')
                type = LISP_OBJECT;
              else if (c == 'B')