From: Bruno Haible <bruno@clisp.org>
Date: Sat, 27 Apr 2019 09:43:45 +0000 (+0200)
Subject: intl: Use the lookup optimization also on platforms without per-thread locales.
X-Git-Tag: v0.20~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9daba8f33bec565b1fcfd42cac5e93a841c40462;p=thirdparty%2Fgettext.git

intl: Use the lookup optimization also on platforms without per-thread locales.

This bug was introduced on 2007-01-27.

* gettext-runtime/intl/dcigettext.c (DCIGETTEXT): Fix #ifdef/#endif chain.
---

diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index eabf9ee53..ba333303f 100644
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -560,9 +560,10 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 #  endif
 # endif
   search.localename = localename;
-# ifdef IN_LIBGLOCALE
+#endif
+#ifdef IN_LIBGLOCALE
   search.encoding = encoding;
-# endif
+#endif
 
   /* Since tfind/tsearch manage a balanced tree, concurrent tfind and
      tsearch calls can be fatal.  */
@@ -588,7 +589,6 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
       __set_errno (saved_errno);
       return retval;
     }
-#endif
 
   /* See whether this is a SUID binary or not.  */
   DETERMINE_SECURE;