Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8ea0257

Browse files
committed
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.
1 parent 0d3b231 commit 8ea0257

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/include/port.h

+10-9
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,6 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);
184184
#ifdef printf
185185
#undef printf
186186
#endif
187-
/*
188-
* Versions of libintl >= 0.18? try to replace setlocale() with a macro
189-
* to their own versions. Remove the macro, if it exists, because it
190-
* ends up calling the wrong version when the backend and libintl use
191-
* different versions of msvcrt.
192-
*/
193-
#if defined(setlocale) && defined(WIN32)
194-
#undef setlocale
195-
#endif
196187

197188
extern int pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
198189
extern int
@@ -235,6 +226,16 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
235226
#endif
236227
#endif /* USE_REPL_SNPRINTF */
237228

229+
/*
230+
* Versions of libintl >= 0.18? try to replace setlocale() with a macro
231+
* to their own versions. Remove the macro, if it exists, because it
232+
* ends up calling the wrong version when the backend and libintl use
233+
* different versions of msvcrt.
234+
*/
235+
#if defined(setlocale) && defined(WIN32)
236+
#undef setlocale
237+
#endif
238+
238239
/* Portable prompt handling */
239240
extern char *simple_prompt(const char *prompt, int maxlen, bool echo);
240241

0 commit comments

Comments
 (0)