Collegues,
Postgresql embeded perl, plperl contain code long time ago copied
from POSIX.xs file in the perl distribution.
It is function setlocale_perl, which does some allocation of
perl-specific locale data using functions(or macros) new_ctype,
new_collate and new_numeric.
This is used only for WIN32, because as comment in the code said:
/*
* The perl library on startup does horrible things like call
* setlocale(LC_ALL,""). We have protected against that on most platforms
* by setting the environment appropriately. However, on Windows,
* setlocale() does not consult the environment, so we need to save the
* existing locale settings before perl has a chance to mangle them and
* restore them after its dirty deeds are done.
*
* MSDN ref:
* http://msdn.microsoft.com/library/en-us/vclib/html/_crt_locale.asp
*
* It appears that we only need to do this on interpreter startup, and
* subsequent calls to the interpreter don't mess with the locale
* settings.
*
* We restore them using setlocale_perl(), defined below, so that Perl
* doesn't have a different idea of the locale from Postgres.
*
*/
This worked up to perl 5.26. But in perl 5.28 these macros and
corresponding functions became strictly private. However public
function Perl_setlocale appeared in libperl, which from the quick
glance to the code does the same thing as setlocale_perl in plperl code.
Attached patch makes use of this function if PERL_VERSION >= 28.
It makes plperl compile with ActiveStatePerl 5.28 and StrawberryPerl
5.30.2.1.
However, I'm not sure that I've choose correct approach. May be perl
just no more does horrible things with locale at startup?
--
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 2db13d30308..d2787b50beb 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -300,8 +300,12 @@ static OP *pp_require_safe(pTHX);
static void activate_interpreter(plperl_interp_desc *interp_desc);
#ifdef WIN32
+#if PERL_VERSION >= 28
+#define setlocale_perl(a,b) Perl_setlocale(a,b)
+#else
static char *setlocale_perl(int category, char *locale);
#endif
+#endif
/*
* Decrement the refcount of the given SV within the active Perl interpreter
@@ -4159,6 +4163,7 @@ plperl_inline_callback(void *arg)
* (needed because of the calls to new_*())
*/
#ifdef WIN32
+#if PERL_VERSION < 28
static char *
setlocale_perl(int category, char *locale)
{
@@ -4226,5 +4231,6 @@ setlocale_perl(int category, char *locale)
return RETVAL;
}
+#endif /* PERL_VERSION < 28 */
#endif /* WIN32 */
diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h
index 3748158a86d..0044983ed1b 100644
--- a/src/pl/plperl/plperl.h
+++ b/src/pl/plperl/plperl.h
@@ -51,11 +51,11 @@
*/
#ifdef _MSC_VER
#define __inline__ inline
+#define __builtin_expect(a, b) (a == b)
#ifdef isnan
#undef isnan
#endif
#endif
-
/*
* Regarding bool, both PostgreSQL and Perl might use stdbool.h or not,
* depending on configuration. If both agree, things are relatively harmless.
