From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 7 Dec 2010 04:54:15 +0000 (-0800)
Subject: i18n: Remove unnecessary #ifs.
X-Git-Tag: v0.7.7~103
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf376bc7dcdbdd886ddb35870c8636d14a955b39;p=pspp-builds.git

i18n: Remove unnecessary #ifs.

The test for LC_MESSAGES should not be necessary because Gnulib ensures
that LC_MESSAGES is always defined.

The test for ENABLE_NLS should not be necessary because PSPP has not
supported that configuration for some time.
---

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 49346171..5d03d19a 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -229,17 +229,13 @@ recode_substring_pool (const char *to, const char *from,
 void
 i18n_init (void)
 {
-#if ENABLE_NLS
   setlocale (LC_CTYPE, "");
-#ifdef LC_MESSAGES
   setlocale (LC_MESSAGES, "");
-#endif
 #if HAVE_LC_PAPER
   setlocale (LC_PAPER, "");
 #endif
   bindtextdomain (PACKAGE, relocate(locale_dir));
   textdomain (PACKAGE);
-#endif /* ENABLE_NLS */
 
   assert (default_encoding == NULL);
   default_encoding = xstrdup (locale_charset ());