* sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults.

Fixes: debbugs:18051

* sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults.
Fixes: debbugs:18051
cbe070d1 · Paul Eggert · 9bac5fd9 · cbe070d1 · cbe070d1
Commit cbe070d1 authored Aug 27, 2014 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/sysdep.c src/sysdep.c +4 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2014-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults
+	(Bug#18051).
+
 2014-08-27  Eli Zaretskii  <eliz@gnu.org>

 	* syntax.c (scan_lists): Don't examine positions before BEGV.

--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3601,8 +3601,11 @@ system_process_attributes (Lisp_Object pid)

 # 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