[Emacs-diffs] /srv/bzr/emacs/trunk r109229: Fix failure to compile on Windows due to revision 109223.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109229
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-27 12:24:34 +0300
message:
  Fix failure to compile on Windows due to revision 109223.
  
   src/lisp.h (enum constype): Use CONSTYPE_HEAP and CONSTYPE_PURE for
   enumeration constants, as PURE and HEAP are too general, and clash
   with other headers and sources, such as gmalloc.c and the
   MS-Windows system headers.  All users changed.
modified:
  src/ChangeLog
  src/alloc.c
  src/buffer.c
  src/callint.c
  src/charset.c
  src/coding.c
  src/keymap.c
  src/lisp.h
  src/search.c
  src/syntax.c
  src/w32.c
  src/w32fns.c
  src/xdisp.c
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-27 07:51:52 +0000
+++ b/src/ChangeLog     2012-07-27 09:24:34 +0000
@@ -1,3 +1,10 @@
+2012-07-27  Eli Zaretskii  <address@hidden>
+
+       * lisp.h (enum constype): Use CONSTYPE_HEAP and CONSTYPE_PURE for
+       enumeration constants, as PURE and HEAP are too general, and clash
+       with other headers and sources, such as gmalloc.c and the
+       MS-Windows system headers.  All users changed.
+
 2012-07-27  Dmitry Antipov  <address@hidden>
 
        Revert last save_excursion_save and save_excursion_restore changes.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2012-07-27 07:51:52 +0000
+++ b/src/alloc.c       2012-07-27 09:24:34 +0000
@@ -2813,7 +2813,7 @@
 
 /* Make a list of COUNT Lisp_Objects, where ARG is the
    first one.  Allocate conses from pure space if TYPE
-   is PURE, or allocate as usual if type is HEAP.  */
+   is CONSTYPE_PURE, or allocate as usual if type is CONSTYPE_HEAP.  */
 
 Lisp_Object
 listn (enum constype type, ptrdiff_t count, Lisp_Object arg, ...)
@@ -2834,9 +2834,9 @@
 
   for (i = 0, val = Qnil; i < count; i++)
     {
-      if (type == PURE)
+      if (type == CONSTYPE_PURE)
        val = pure_cons (objp[i], val);
-      else if (type == HEAP)
+      else if (type == CONSTYPE_HEAP)
        val = Fcons (objp[i], val);
       else
        abort ();
@@ -6676,7 +6676,7 @@
   (but the contents of a buffer's text do not count here).  */)
   (void)
 {
-  return listn (HEAP, 8,
+  return listn (CONSTYPE_HEAP, 8,
                bounded_number (cons_cells_consed),
                bounded_number (floats_consed),
                bounded_number (vector_cells_consed),
@@ -6865,7 +6865,7 @@
   /* We build this in advance because if we wait until we need it, we might
      not be able to allocate the memory to hold it.  */
   Vmemory_signal_data
-    = listn (PURE, 2, Qerror,
+    = listn (CONSTYPE_PURE, 2, Qerror,
             build_pure_c_string ("Memory exhausted--use M-x save-some-buffers 
then exit and restart Emacs"));
 
   DEFVAR_LISP ("memory-full", Vmemory_full,

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2012-07-27 06:04:35 +0000
+++ b/src/buffer.c      2012-07-27 09:24:34 +0000
@@ -5212,7 +5212,7 @@
   DEFSYM (Qkill_buffer_query_functions, "kill-buffer-query-functions");
 
   Fput (Qprotected_field, Qerror_conditions,
-       listn (PURE, 2, Qprotected_field, Qerror));
+       listn (CONSTYPE_PURE, 2, Qprotected_field, Qerror));
   Fput (Qprotected_field, Qerror_message,
        build_pure_c_string ("Attempt to modify a protected field"));
 

=== modified file 'src/callint.c'
--- a/src/callint.c     2012-07-27 06:04:35 +0000
+++ b/src/callint.c     2012-07-27 09:24:34 +0000
@@ -888,7 +888,7 @@
   callint_message = Qnil;
   staticpro (&callint_message);
 
-  preserved_fns = listn (PURE, 4,
+  preserved_fns = listn (CONSTYPE_PURE, 4,
                         intern_c_string ("region-beginning"),
                         intern_c_string ("region-end"),
                         intern_c_string ("point"),

=== modified file 'src/charset.c'
--- a/src/charset.c     2012-07-27 06:04:35 +0000
+++ b/src/charset.c     2012-07-27 09:24:34 +0000
@@ -1283,7 +1283,7 @@
   args[charset_arg_unify_map] = Qnil;
 
   args[charset_arg_plist] =
-    listn (HEAP, 14,
+    listn (CONSTYPE_HEAP, 14,
           intern_c_string (":name"),
           args[charset_arg_name],
           intern_c_string (":dimension"),

=== modified file 'src/coding.c'
--- a/src/coding.c      2012-07-27 06:04:35 +0000
+++ b/src/coding.c      2012-07-27 09:24:34 +0000
@@ -10411,7 +10411,7 @@
 
   DEFSYM (Qcoding_system_error, "coding-system-error");
   Fput (Qcoding_system_error, Qerror_conditions,
-       listn (PURE, 2, Qcoding_system_error, Qerror));
+       listn (CONSTYPE_PURE, 2, Qcoding_system_error, Qerror));
   Fput (Qcoding_system_error, Qerror_message,
        build_pure_c_string ("Invalid coding system"));
 

=== modified file 'src/keymap.c'
--- a/src/keymap.c      2012-07-27 06:04:35 +0000
+++ b/src/keymap.c      2012-07-27 09:24:34 +0000
@@ -3702,7 +3702,7 @@
   Fset (intern_c_string ("ctl-x-map"), control_x_map);
   Ffset (intern_c_string ("Control-X-prefix"), control_x_map);
 
-  exclude_keys = listn (PURE, 5,
+  exclude_keys = listn (CONSTYPE_PURE, 5,
                        pure_cons (build_pure_c_string ("DEL"), 
build_pure_c_string ("\\d")),
                        pure_cons (build_pure_c_string ("TAB"), 
build_pure_c_string ("\\t")),
                        pure_cons (build_pure_c_string ("RET"), 
build_pure_c_string ("\\r")),
@@ -3760,7 +3760,7 @@
   where_is_preferred_modifier = 0;
 
   staticpro (&Vmouse_events);
-  Vmouse_events = listn (PURE, 9,
+  Vmouse_events = listn (CONSTYPE_PURE, 9,
                         intern_c_string ("menu-bar"),
                         intern_c_string ("tool-bar"),
                         intern_c_string ("header-line"),

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-07-27 07:51:52 +0000
+++ b/src/lisp.h        2012-07-27 09:24:34 +0000
@@ -2643,7 +2643,7 @@
 extern Lisp_Object list4 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
 extern Lisp_Object list5 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object,
                          Lisp_Object);
-enum constype {HEAP, PURE};
+enum constype {CONSTYPE_HEAP, CONSTYPE_PURE};
 extern Lisp_Object listn (enum constype, ptrdiff_t, Lisp_Object, ...);
 extern _Noreturn void string_overflow (void);
 extern Lisp_Object make_string (const char *, ptrdiff_t);

=== modified file 'src/search.c'
--- a/src/search.c      2012-07-27 06:04:35 +0000
+++ b/src/search.c      2012-07-27 09:24:34 +0000
@@ -3054,12 +3054,12 @@
   DEFSYM (Qinvalid_regexp, "invalid-regexp");
 
   Fput (Qsearch_failed, Qerror_conditions,
-       listn (PURE, 2, Qsearch_failed, Qerror));
+       listn (CONSTYPE_PURE, 2, Qsearch_failed, Qerror));
   Fput (Qsearch_failed, Qerror_message,
        build_pure_c_string ("Search failed"));
 
   Fput (Qinvalid_regexp, Qerror_conditions,
-       listn (PURE, 2, Qinvalid_regexp, Qerror));
+       listn (CONSTYPE_PURE, 2, Qinvalid_regexp, Qerror));
   Fput (Qinvalid_regexp, Qerror_message,
        build_pure_c_string ("Invalid regexp"));
 

=== modified file 'src/syntax.c'
--- a/src/syntax.c      2012-07-27 06:04:35 +0000
+++ b/src/syntax.c      2012-07-27 09:24:34 +0000
@@ -3473,7 +3473,7 @@
 
   DEFSYM (Qscan_error, "scan-error");
   Fput (Qscan_error, Qerror_conditions,
-       listn (PURE, 2, Qscan_error, Qerror));
+       listn (CONSTYPE_PURE, 2, Qscan_error, Qerror));
   Fput (Qscan_error, Qerror_message,
        build_pure_c_string ("Scan error"));
 

=== modified file 'src/w32.c'
--- a/src/w32.c 2012-07-27 07:36:33 +0000
+++ b/src/w32.c 2012-07-27 09:24:34 +0000
@@ -1722,8 +1722,8 @@
                dwType = REG_EXPAND_SZ;
                dont_free = 1;
                if (!strcmp (env_vars[i].name, "HOME") && !appdata)
-                 Vdelayed_warnings_list 
-                   = Fcons (listn (HEAP, 2,
+                 Vdelayed_warnings_list
+                   = Fcons (listn (CONSTYPE_HEAP, 2,
                                    intern ("initialization"),
                                    build_string ("Setting HOME to C:\\ by 
default is deprecated")),
                             Vdelayed_warnings_list);

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-07-27 07:36:33 +0000
+++ b/src/w32fns.c      2012-07-27 09:24:34 +0000
@@ -6544,7 +6544,7 @@
          remain = build_string (buffer);
        }
 
-      status = listn (HEAP, 8,
+      status = listn (CONSTYPE_HEAP, 8,
                      Fcons (make_number ('L'), line_status),
                      Fcons (make_number ('B'), battery_status),
                      Fcons (make_number ('b'), battery_status_symbol),
@@ -6794,7 +6794,7 @@
 
 
   Fput (Qundefined_color, Qerror_conditions,
-       listn (PURE, 2, Qundefined_color, Qerror));
+       listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror));
   Fput (Qundefined_color, Qerror_message,
        build_pure_c_string ("Undefined color"));
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-07-27 06:04:35 +0000
+++ b/src/xdisp.c       2012-07-27 09:24:34 +0000
@@ -28932,10 +28932,10 @@
 \(see `modify-frame-parameters').  */);
   Vicon_title_format
     = Vframe_title_format
-    = listn (PURE, 3,
+    = listn (CONSTYPE_PURE, 3,
             intern_c_string ("multiple-frames"),
             build_pure_c_string ("%b"),
-            listn (PURE, 4,
+            listn (CONSTYPE_PURE, 4,
                    empty_unibyte_string,
                    intern_c_string ("invocation-name"),
                    build_pure_c_string ("@"),

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2012-07-27 06:04:35 +0000
+++ b/src/xfns.c        2012-07-27 09:24:34 +0000
@@ -5822,7 +5822,7 @@
   /* This is the end of symbol initialization.  */
 
   Fput (Qundefined_color, Qerror_conditions,
-       listn (PURE, 2, Qundefined_color, Qerror));
+       listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror));
   Fput (Qundefined_color, Qerror_message,
        build_pure_c_string ("Undefined color"));