From 400cb4e34d36efbffd4b007ca600d44c257e5189 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Mon, 22 Sep 2008 14:37:51 +0000 Subject: [PATCH] 2008-09-22 16:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/hbregex.c * added hack to force linking newer PCRE versions not the one included in BCC RTL when Harbour is compiled without HB_PCRE_REGEX_BCC. If user application will uses regex expressions (directly or indirectly by some RTL functions) then lining it without HBPCE should give link time error that pcre_config() function is missing. --- harbour/ChangeLog | 8 ++++++++ harbour/source/rtl/hbregex.c | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b1923c0898..f53a83cd8c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-22 16:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/rtl/hbregex.c + * added hack to force linking newer PCRE versions not the one included + in BCC RTL when Harbour is compiled without HB_PCRE_REGEX_BCC. + If user application will uses regex expressions (directly or indirectly + by some RTL functions) then lining it without HBPCE should give link + time error that pcre_config() function is missing. + 2008-09-22 16:14 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbstack.h * harbour/source/vm/estack.c diff --git a/harbour/source/rtl/hbregex.c b/harbour/source/rtl/hbregex.c index fe7fb4e348..eea93e7981 100644 --- a/harbour/source/rtl/hbregex.c +++ b/harbour/source/rtl/hbregex.c @@ -543,6 +543,13 @@ static void * hb_pcre_grab( size_t size ) HB_CALL_ON_STARTUP_BEGIN( _hb_regex_init_ ) #if defined( HB_PCRE_REGEX ) + /* Hack to force linking newer PCRE versions not the one included in BCC RTL */ +# if defined( __BORLANDC__ ) + { + int iUTF8Enabled; + pcre_config( PCRE_CONFIG_UTF8, &iUTF8Enabled ); + } +# endif pcre_malloc = hb_pcre_grab; pcre_free = hb_xfree; pcre_stack_malloc = hb_pcre_grab;