提交 8ea02570 编写于 作者: H Heikki Linnakangas

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.
上级 0d3b231e
......@@ -184,15 +184,6 @@ extern unsigned char pg_ascii_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
......@@ -235,6 +226,16 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册