apply patch for #237 to fix initialization ordering around setlocale

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2604 4e78687f-474d-0410-85f9-8d5e500ac6b2

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 97d14fd6..9ad3a1aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 2015-02-16 Howard Butler <howard@hobu.co>
+	* src/pj_init.c: Fix #237 warning about initialization 
+	ordering due to setlocale
+
+2015-02-16 Howard Butler <howard@hobu.co>
 	* nad/Makefile.am nad/Makefile.in and others in nad/: Fix #247 to 
 	allow out-of-tree autoconf builds
 
diff --git a/src/pj_init.c b/src/pj_init.c
index 9d9c2265..bea4f86c 100644
--- a/src/pj_init.c
+++ b/src/pj_init.c
@@ -405,8 +405,8 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) {
     old_locale = setlocale(LC_NUMERIC, NULL);
     if (old_locale != NULL) {
        if (strcmp(old_locale,"C") != 0) {
-	  setlocale(LC_NUMERIC,"C");
 	  old_locale = strdup(old_locale);
+	  setlocale(LC_NUMERIC,"C");
        }else
 	  old_locale = NULL;
     }