diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-11-07 14:21:52 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-11-07 14:21:52 -0500 |
| commit | 1016549873446934dffd14e59bfa3a6b9dec9b89 (patch) | |
| tree | 1b88951f55122c7b30abde948ea5ae5c91a9b5e9 | |
| parent | b75ccddcd6f747dc386411eeac6bbfdface14a2c (diff) | |
| download | postgresql-1016549873446934dffd14e59bfa3a6b9dec9b89.tar.gz | |
Move declaration of ecpg_gettext() to a saner place.
Declaring this in the client-visible header ecpglib.h was a pretty
poor decision. It's not meant to be application-callable (and if
it was, putting it outside the extern "C" { ... } wrapper means
that C++ clients would fail to call it). And the declaration would
not even compile for a client, anyway, since it would not have the
macro pg_attribute_format_arg(). Fortunately, it seems that no
clients have tried to include this header with ENABLE_NLS defined,
or we'd have gotten complaints about that. But we have no business
putting such a restriction on client code.
Move the declaration to ecpglib_extern.h, since in fact nothing
outside src/interfaces/ecpg/ecpglib/ needs to call it.
The practical effect of this is just that clients can now safely
#include ecpglib.h while having ENABLE_NLS defined, but that seems
like enough of a reason to back-patch it.
Discussion: https://postgr.es/m/20590.1573069709@sss.pgh.pa.us
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/ecpglib_extern.h | 6 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/ecpglib.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h index 869a9e92b2..bf2ce5beec 100644 --- a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h +++ b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h @@ -222,6 +222,12 @@ unsigned ecpg_hex_dec_len(unsigned srclen); unsigned ecpg_hex_enc_len(unsigned srclen); unsigned ecpg_hex_encode(const char *src, unsigned len, char *dst); +#ifdef ENABLE_NLS +extern char *ecpg_gettext(const char *msgid) pg_attribute_format_arg(1); +#else +#define ecpg_gettext(x) (x) +#endif + /* SQLSTATE values generated or processed by ecpglib (intentionally * not exported -- users should refer to the codes directly) */ diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h index 8a601996d2..a427451930 100644 --- a/src/interfaces/ecpg/include/ecpglib.h +++ b/src/interfaces/ecpg/include/ecpglib.h @@ -12,12 +12,6 @@ #include "sqlca.h" #include <string.h> -#ifdef ENABLE_NLS -extern char *ecpg_gettext(const char *msgid) pg_attribute_format_arg(1); -#else -#define ecpg_gettext(x) (x) -#endif - #ifndef __cplusplus #ifndef bool #define bool char |