From 84de2c966be6df8599c8d8d13c6e971f550cb2a0 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 23 May 2011 15:34:11 -0400 Subject: [PATCH] ServerShutdownModule_GETTEXT() was failing on non-locale-aware systems, fixed --- webcit/gettext.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/webcit/gettext.c b/webcit/gettext.c index 382053a77..43b8db26e 100644 --- a/webcit/gettext.c +++ b/webcit/gettext.c @@ -41,7 +41,7 @@ const char *AvailLang[] = { "" }; -const char **AvailLangLoaded; +const char **AvailLangLoaded = NULL; long nLocalesLoaded = 0; #ifdef HAVE_USELOCALE @@ -379,22 +379,6 @@ void initialize_locales(void) { #endif } - -void -ServerShutdownModule_GETTEXT -(void) -{ -#ifdef HAVE_USELOCALE - int i; - for (i = 0; i < nLocalesLoaded; ++i) { - if (Empty_Locale != wc_locales[i]) - freelocale(wc_locales[i]); - } - free(wc_locales); -#endif - free(AvailLangLoaded); -} - #else /* ENABLE_NLS */ const char *AvailLang[] = { "C", ""}; @@ -493,4 +477,20 @@ SessionDestroyModule_GETTEXT #ifdef ENABLE_NLS stop_selected_language(); /* unset locale */ #endif + +void +ServerShutdownModule_GETTEXT +(void) +{ +#ifdef HAVE_USELOCALE + int i; + for (i = 0; i < nLocalesLoaded; ++i) { + if (Empty_Locale != wc_locales[i]) + freelocale(wc_locales[i]); + } + free(wc_locales); +#endif + if (!AvailLangLoaded) free(AvailLangLoaded); +} + } -- 2.39.2