From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 28 Aug 2014 00:50:36 +0000 (-0700)
Subject: * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~418
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cbe070d11440419e271aba723aa42d834395f2cd;p=emacs.git

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

Fixes: debbugs:18051
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a7c8cb59a0f..e79cef6a8a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/src/sysdep.c b/src/sysdep.c
index d50e2398a53..a336a1e9058 100644
--- 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