mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Heikki Linnakangas 2011-09-01 09:13:37 +03:00
parent 899d7b00e9
commit f2d875983b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/include/port.h
View File

@ -165,15 +165,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
@ -216,6 +207,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);