From 02467e1ca1745158c99c9b2576b05850028394f7 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 10 May 2012 12:38:09 +0000
Subject: [PATCH] [PATCH] [BZ #3440] Make LC_ALL etc. useful in #if
 expressions.

---
 ChangeLog            |  9 +++++++++
 NEWS                 | 30 +++++++++++++++---------------
 locale/bits/locale.h | 31 ++++++++++++++-----------------
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7db579c153..d44f1f406e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	[BZ #3440]
+	* locale/bits/locale.h (__LC_CTYPE, __LC_NUMERIC, __LC_TIME)
+	(__LC_COLLATE, __LC_MONETARY, __LC_MESSAGES, __LC_ALL, __LC_PAPER)
+	(__LC_NAME, __LC_ADDRESS, __LC_TELEPHONE, __LC_MEASUREMENT)
+	(__LC_IDENTIFICATION): Make these macros useful in #if
+	expressions, as required by C99.
+
 2012-05-10  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sunrpc/Makefile (extra-objs) [$(build-shared) = yes]: Add
diff --git a/NEWS b/NEWS
index 2cf47c3921..ba00909f29 100644
--- a/NEWS
+++ b/NEWS
@@ -10,21 +10,21 @@ Version 2.16
 * The following bugs are resolved with this release:
 
   174, 350, 369, 411, 706, 887, 2074, 2541, 2547, 2548, 2550, 2551, 2552,
-  2553, 2554, 2562, 2563, 2565, 2566, 2570, 2576, 2636, 2678, 3335, 3768,
-  3866, 3868, 3976, 3992, 4026, 4108, 4596, 4822, 5077, 5461, 5805, 5993,
-  6471, 6486, 6578, 6649, 6730, 6770, 6794, 6884, 6890, 6894, 6895, 6907,
-  6911, 6959, 7064, 9739, 9902, 10110, 10135, 10140, 10153, 10210, 10254,
-  10346, 10545, 10716, 11174, 11322, 11365, 11451, 11494, 11521, 11959,
-  12047, 12340, 13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531,
-  13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13563, 13566,
-  13583, 13592, 13618, 13637, 13656, 13658, 13673, 13691, 13695, 13704,
-  13705, 13706, 13726, 13738, 13739, 13758, 13760, 13761, 13775, 13786,
-  13787, 13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852,
-  13854, 13871, 13872, 13873, 13879, 13883, 13884, 13885, 13886, 13892,
-  13895, 13908, 13910, 13911, 13912, 13913, 13914, 13915, 13916, 13917,
-  13918, 13919, 13920, 13921, 13922, 13923, 13924, 13926, 13927, 13928,
-  13938, 13941, 13942, 13963, 13967, 13970, 13973, 13979, 13983, 14027,
-  14033, 14034, 14040, 14049, 14053, 14055, 14064, 14080, 14083
+  2553, 2554, 2562, 2563, 2565, 2566, 2570, 2576, 2636, 2678, 3335, 3440,
+  3768, 3866, 3868, 3976, 3992, 4026, 4108, 4596, 4822, 5077, 5461, 5805,
+  5993, 6471, 6486, 6578, 6649, 6730, 6770, 6794, 6884, 6890, 6894, 6895,
+  6907, 6911, 6959, 7064, 9739, 9902, 10110, 10135, 10140, 10153, 10210,
+  10254, 10346, 10545, 10716, 11174, 11322, 11365, 11451, 11494, 11521,
+  11959, 12047, 12340, 13058, 13525, 13526, 13527, 13528, 13529, 13530,
+  13531, 13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13563,
+  13566, 13583, 13592, 13618, 13637, 13656, 13658, 13673, 13691, 13695,
+  13704, 13705, 13706, 13726, 13738, 13739, 13758, 13760, 13761, 13775,
+  13786, 13787, 13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851,
+  13852, 13854, 13871, 13872, 13873, 13879, 13883, 13884, 13885, 13886,
+  13892, 13895, 13908, 13910, 13911, 13912, 13913, 13914, 13915, 13916,
+  13917, 13918, 13919, 13920, 13921, 13922, 13923, 13924, 13926, 13927,
+  13928, 13938, 13941, 13942, 13963, 13967, 13970, 13973, 13979, 13983,
+  14027, 14033, 14034, 14040, 14049, 14053, 14055, 14064, 14080, 14083
 
 * ISO C11 support:
 
diff --git a/locale/bits/locale.h b/locale/bits/locale.h
index aa6949f4e4..905a1ffee8 100644
--- a/locale/bits/locale.h
+++ b/locale/bits/locale.h
@@ -1,5 +1,5 @@
 /* Definition of locale category symbol values.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,21 +23,18 @@
 #ifndef _BITS_LOCALE_H
 #define _BITS_LOCALE_H	1
 
-enum
-{
-  __LC_CTYPE = 0,
-  __LC_NUMERIC = 1,
-  __LC_TIME = 2,
-  __LC_COLLATE = 3,
-  __LC_MONETARY = 4,
-  __LC_MESSAGES = 5,
-  __LC_ALL = 6,
-  __LC_PAPER = 7,
-  __LC_NAME = 8,
-  __LC_ADDRESS = 9,
-  __LC_TELEPHONE = 10,
-  __LC_MEASUREMENT = 11,
-  __LC_IDENTIFICATION = 12
-};
+#define __LC_CTYPE		 0
+#define __LC_NUMERIC		 1
+#define __LC_TIME		 2
+#define __LC_COLLATE		 3
+#define __LC_MONETARY		 4
+#define __LC_MESSAGES		 5
+#define __LC_ALL		 6
+#define __LC_PAPER		 7
+#define __LC_NAME		 8
+#define __LC_ADDRESS		 9
+#define __LC_TELEPHONE		10
+#define __LC_MEASUREMENT	11
+#define __LC_IDENTIFICATION	12
 
 #endif	/* bits/locale.h */