Fix build of ICU support in Windows
and also any platform that does not have locale_t but enabled ICU. Author: Ashutosh Sharma <ashu.coek88@gmail.com>
This commit is contained in:
parent
bf6e4c3c82
commit
253504fb9f
|
@ -411,10 +411,10 @@ get_icu_locale_comment(const char *localename)
|
||||||
Datum
|
Datum
|
||||||
pg_import_system_collations(PG_FUNCTION_ARGS)
|
pg_import_system_collations(PG_FUNCTION_ARGS)
|
||||||
{
|
{
|
||||||
#if defined(HAVE_LOCALE_T) && !defined(WIN32)
|
|
||||||
bool if_not_exists = PG_GETARG_BOOL(0);
|
bool if_not_exists = PG_GETARG_BOOL(0);
|
||||||
Oid nspid = PG_GETARG_OID(1);
|
Oid nspid = PG_GETARG_OID(1);
|
||||||
|
|
||||||
|
#if defined(HAVE_LOCALE_T) && !defined(WIN32)
|
||||||
FILE *locale_a_handle;
|
FILE *locale_a_handle;
|
||||||
char localebuf[NAMEDATALEN]; /* we assume ASCII so this is fine */
|
char localebuf[NAMEDATALEN]; /* we assume ASCII so this is fine */
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
@ -431,6 +431,12 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
|
||||||
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
|
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
|
||||||
(errmsg("must be superuser to import system collations"))));
|
(errmsg("must be superuser to import system collations"))));
|
||||||
|
|
||||||
|
#if !(defined(HAVE_LOCALE_T) && !defined(WIN32)) && !defined(USE_ICU)
|
||||||
|
/* silence compiler warnings */
|
||||||
|
(void) if_not_exists;
|
||||||
|
(void) nspid;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(HAVE_LOCALE_T) && !defined(WIN32)
|
#if defined(HAVE_LOCALE_T) && !defined(WIN32)
|
||||||
locale_a_handle = OpenPipeStream("locale -a", "r");
|
locale_a_handle = OpenPipeStream("locale -a", "r");
|
||||||
if (locale_a_handle == NULL)
|
if (locale_a_handle == NULL)
|
||||||
|
|
Loading…
Reference in New Issue