Move setlocale() outside of NLS-only defines.

bmomjian · bmomjian · commit 437063bdc42f · 2004-05-26T19:00:31.000Z
diff --git a/src/port/path.c b/src/port/path.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/path.c,v 1.15 2004/05/25 20:47:41 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/path.c,v 1.16 2004/05/26 19:00:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -234,11 +234,13 @@ set_pglocale(const char *argv0, const char *app)
 #ifdef ENABLE_NLS
 	char path[MAXPGPATH];
 	char my_exec_path[MAXPGPATH];
+#endif
 
 	/* don't set LC_ALL in the backend */
 	if (strcmp(app, "postgres") != 0)
 		setlocale(LC_ALL, "");
 
+#ifdef ENABLE_NLS
 	if (find_my_exec(argv0, my_exec_path) < 0)
 		return;
 		

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/port/path.c,v 1.15 2004/05/25 20:47:41 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/path.c,v 1.16 2004/05/26 19:00:31 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -234,11 +234,13 @@ set_pglocale(const char argv0, const char app)`
`234`	`234`	`#ifdef ENABLE_NLS`
`235`	`235`	`char path[MAXPGPATH];`
`236`	`236`	`char my_exec_path[MAXPGPATH];`
	`237`	`+#endif`
`237`	`238`
`238`	`239`	`/* don't set LC_ALL in the backend */`
`239`	`240`	`if (strcmp(app, "postgres") != 0)`
`240`	`241`	`setlocale(LC_ALL, "");`
`241`	`242`
	`243`	`+#ifdef ENABLE_NLS`
`242`	`244`	`if (find_my_exec(argv0, my_exec_path) < 0)`
`243`	`245`	`return;`
`244`	`246`