From 12f0c3e547810cfe8db669904623a1207b77a67e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 18 Sep 2009 12:15:26 +0200
Subject: [PATCH] i18n: Simplify `RUN_IN_LOCALE_SECTION' (GNU version).

* libguile/i18n.c (RUN_IN_LOCALE_SECTION)[USE_GNU_LOCALE_API]: Remove
  extraneous uselocale(3) call.
---
 libguile/i18n.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/libguile/i18n.c b/libguile/i18n.c
index 28dfe4d8c..2a6c4b609 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -509,19 +509,15 @@ get_current_locale (SCM *result)
 #else /* USE_GNU_LOCALE_API */
 
 /* Convenient macro to run STATEMENT in the locale context of C_LOCALE.  */
-#define RUN_IN_LOCALE_SECTION(_c_locale, _statement)                    \
-  do                                                                    \
-    {                                                                   \
-      scm_t_locale old_loc = uselocale (NULL);                          \
-      if (old_loc != _c_locale)                                         \
-        {                                                               \
-          uselocale (_c_locale);                                        \
-          _statement ;                                                  \
-          uselocale (old_loc);                                          \
-        }                                                               \
-      else                                                              \
-        _statement;                                                     \
-    }                                                                   \
+#define RUN_IN_LOCALE_SECTION(_c_locale, _statement)	\
+  do							\
+    {							\
+      scm_t_locale old_loc;				\
+							\
+      old_loc = uselocale (_c_locale);			\
+      _statement ;					\
+      uselocale (old_loc);				\
+    }							\
   while (0)