git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c

index 5c2e951be10d7846fc8b05fcaa438c90da6a50ba..b22021ed1c4101cce82d5ec23449c85b9e5e633b 100644 (file)

--- a/src/backend/utils/adt/pg_locale.c

+++ b/src/backend/utils/adt/pg_locale.c

*

* Portions Copyright (c) 2002-2003, PostgreSQL Global Development Group

*

- * $PostgreSQL: pgsql/src/backend/utils/adt/pg_locale.c,v 1.25 2004年01月19日 19:04:40 tgl Exp $

+ * $PostgreSQL: pgsql/src/backend/utils/adt/pg_locale.c,v 1.26 2004年05月27日 19:19:05 tgl Exp $

*

*-----------------------------------------------------------------------

*/

if (doit)

{

if (!setlocale(LC_MESSAGES, value))

+ {

+#ifdef WIN32

+ /*

+ * Win32 returns NULL when you set LC_MESSAGES to "". So don't

+ * complain unless we're trying to set it to something else.

+ */

+ if (value[0])

+ return NULL;

+#else

return NULL;

+#endif

+ }

}

else

value = locale_xxx_assign(LC_MESSAGES, value, false, source);

-#endif

+#endif /* LC_MESSAGES */

return value;

}