Move the line to undefine setlocale() macro on Win32 outside USE_REPL_SNPRINTF

ifdef block. It has nothing to do with whether the replacement snprintf
function is used. It caused no live bug, because the replacement snprintf
function is always used on Win32, but it was nevertheless misplaced.

diff --git a/src/include/port.h b/src/include/port.h
index fc17d56482f859b5d15280a0dd43c41db7ae02b3..c4a1db777aa7511d62140e714c7b774578efe0d2 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -164,15 +164,6 @@ extern unsigned char pg_tolower(unsigned char ch);
 #ifdef printf
 #undef printf
 #endif
-/*
- * Versions of libintl >= 0.18? try to replace setlocale() with a macro
- * to their own versions.  Remove the macro, if it exists, because it
- * ends up calling the wrong version when the backend and libintl use
- * different versions of msvcrt.
- */
-#if defined(setlocale) && defined(WIN32)
-#undef setlocale
-#endif
 
 extern int     pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
 extern int
@@ -215,6 +206,16 @@ __attribute__((format(printf, 1, 2)));
 #endif
 #endif   /* USE_REPL_SNPRINTF */
 
+/*
+ * Versions of libintl >= 0.18? try to replace setlocale() with a macro
+ * to their own versions.  Remove the macro, if it exists, because it
+ * ends up calling the wrong version when the backend and libintl use
+ * different versions of msvcrt.
+ */
+#if defined(setlocale) && defined(WIN32)
+#undef setlocale
+#endif
+
 /* Portable prompt handling */
 extern char *simple_prompt(const char *prompt, int maxlen, bool echo);