diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2024-08-13 22:13:52 +1200 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2024-08-13 22:13:52 +1200 |
| commit | 14c648ff009438830d15de7c8a93c2b29114eb1c (patch) | |
| tree | e57013d885e4b82b000d342d408c1c8c2e2d3475 /src | |
| parent | 93660d1c27b1b85e84621326c0e2c89e00c3fc6f (diff) | |
| download | postgresql-14c648ff009438830d15de7c8a93c2b29114eb1c.tar.gz postgresql-14c648ff009438830d15de7c8a93c2b29114eb1c.zip | |
All POSIX systems have langinfo.h and CODESET.
We don't need configure probes for HAVE_LANGINFO_H (it is implied by
!WIN32), and we don't need to consider systems that have it but don't
define CODESET (that was for OpenBSD in commit 81cca218, but it has now
had it for 19 years).
Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi>
Discussion: https://postgr.es/m/CA%2BhUKGJqVe0%2BPv9dvC9dSums_PXxGo9SWcxYAMBguWJUGbWz-A%40mail.gmail.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_upgrade/pg_upgrade.c | 4 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
| -rw-r--r-- | src/port/chklocale.c | 20 |
3 files changed, 1 insertions, 26 deletions
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c index 99f3d4543e9..663235816f8 100644 --- a/src/bin/pg_upgrade/pg_upgrade.c +++ b/src/bin/pg_upgrade/pg_upgrade.c @@ -40,10 +40,6 @@ #include <time.h> -#ifdef HAVE_LANGINFO_H -#include <langinfo.h> -#endif - #include "catalog/pg_class_d.h" #include "common/file_perm.h" #include "common/logging.h" diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 0e9b108e667..979925cc2e2 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -238,9 +238,6 @@ /* Define to 1 if you have the `kqueue' function. */ #undef HAVE_KQUEUE -/* Define to 1 if you have the <langinfo.h> header file. */ -#undef HAVE_LANGINFO_H - /* Define to 1 if you have the `ldap_initialize' function. */ #undef HAVE_LDAP_INITIALIZE diff --git a/src/port/chklocale.c b/src/port/chklocale.c index 8cb81c8640e..a0cc52c38df 100644 --- a/src/port/chklocale.c +++ b/src/port/chklocale.c @@ -19,7 +19,7 @@ #include "postgres_fe.h" #endif -#ifdef HAVE_LANGINFO_H +#ifndef WIN32 #include <langinfo.h> #endif @@ -287,8 +287,6 @@ pg_codepage_to_encoding(UINT cp) #endif #endif /* WIN32 */ -#if (defined(HAVE_LANGINFO_H) && defined(CODESET)) || defined(WIN32) - /* * Given a setting for LC_CTYPE, return the Postgres ID of the associated * encoding, if we can determine it. Return -1 if we can't determine it. @@ -415,19 +413,3 @@ pg_get_encoding_from_locale(const char *ctype, bool write_message) free(sys); return -1; } -#else /* (HAVE_LANGINFO_H && CODESET) || WIN32 */ - -/* - * stub if no multi-language platform support - * - * Note: we could return -1 here, but that would have the effect of - * forcing users to specify an encoding to initdb on such platforms. - * It seems better to silently default to SQL_ASCII. - */ -int -pg_get_encoding_from_locale(const char *ctype, bool write_message) -{ - return PG_SQL_ASCII; -} - -#endif /* (HAVE_LANGINFO_H && CODESET) || WIN32 */ |