[Emacs-diffs] trunk r117753: * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults.

[Paul Eggert]

------------------------------------------------------------
revno: 117753
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18051
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-27 17:50:36 -0700
message:
  * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/sysdep.c                   sysdep.c-20091113204419-o5vbwnq5f7feedwu-448

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-08-27 19:40:54 +0000
+++ b/src/ChangeLog     2014-08-28 00:50:36 +0000
@@ -1,3 +1,8 @@
+2014-08-28  Paul Eggert  <address@hidden>
+
+       * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults
+       (Bug#18051).
+
 2014-08-27  Eli Zaretskii  <address@hidden>
 
        * syntax.c (scan_lists): Don't examine positions before BEGV.

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2014-08-27 18:56:47 +0000
+++ b/src/sysdep.c      2014-08-28 00:50:36 +0000
@@ -3601,8 +3601,11 @@
 
 # if defined HAVE_NEWLOCALE || defined HAVE_SETLOCALE
 #  include <locale.h>
-# else
+# endif
+# ifndef LC_COLLATE
 #  define LC_COLLATE 0
+# endif
+# ifndef LC_COLLATE_MASK
 #  define LC_COLLATE_MASK 0
 # endif
 # ifndef HAVE_NEWLOCALE