[GRASS-SVN] r34662 - grass/trunk/lib/gis

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Dec 1 23:41:59 EST 2008


Author: glynn
Date: 2008-12-01 23:41:58 -0500 (Mon, 01 Dec 2008)
New Revision: 34662

Modified:
   grass/trunk/lib/gis/locale.c
Log:
Only conditionalise applicable code on NLS availability, not G_init_locale() itself.


Modified: grass/trunk/lib/gis/locale.c
===================================================================
--- grass/trunk/lib/gis/locale.c	2008-12-02 02:20:49 UTC (rev 34661)
+++ grass/trunk/lib/gis/locale.c	2008-12-02 04:41:58 UTC (rev 34662)
@@ -21,7 +21,6 @@
 #include <grass/glocale.h>
 #include <grass/gis.h>
 
-#if defined(HAVE_LIBINTL_H) && defined(USE_NLS)
 void G_init_locale(void)
 {
     static int initialized;
@@ -33,6 +32,7 @@
     setlocale(LC_CTYPE, "");
     setlocale(LC_MESSAGES, "");
 
+#if defined(HAVE_LIBINTL_H) && defined(USE_NLS)
     gisbase = getenv("GISBASE");
     if (gisbase && *gisbase) {
 	char localedir[GPATH_MAX];
@@ -43,10 +43,10 @@
 	bindtextdomain("grasslibs", localedir);
 	bindtextdomain("grassmods", localedir);
     }
+#endif
 
     G_initialize_done(&initialized);
 }
-#endif
 
 
 /**



More information about the grass-commit mailing list