From 4e8738588f1857a9089ebe2c002e46f2ea0e197b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 12 Sep 2009 16:33:58 +0000 Subject: [PATCH] 2009-09-12 18:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * external/pcre/pcreglob.c ! Fixed fatal mistake in prev commit. * config/global.mk + Extended generic mingw autodetection on *nix to work on Fedora 11. Please test. On Fedora 11 HB_CCPREFIX is i686-pc-mingw32- --- harbour/ChangeLog | 8 ++++++++ harbour/config/global.mk | 2 +- harbour/external/pcre/pcreglob.c | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c46a709005..2c0717ff8f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-12 18:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * external/pcre/pcreglob.c + ! Fixed fatal mistake in prev commit. + + * config/global.mk + + Extended generic mingw autodetection on *nix to work on Fedora 11. + Please test. On Fedora 11 HB_CCPREFIX is i686-pc-mingw32- + 2009-09-12 16:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * external/pcre/pcreglob.c ! Fixed watcom compilation. There are still warnings. diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 9612ca3081..350d58f526 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -521,7 +521,7 @@ ifeq ($(HB_COMPILER),) # generic detection for mingw cross-compiler ifeq ($(HB_CCPATH)$(HB_CCPREFIX),) MINGW_BASE_LIST := /usr /usr/local /usr/local/mingw32 /opt/xmingw - MINGW_PREFIX := $(firstword $(foreach d, $(MINGW_BASE_LIST), $(wildcard $(d)/bin/i?86-mingw*-gcc$(HB_HOST_BIN_EXT)))) + MINGW_PREFIX := $(firstword $(foreach d, $(MINGW_BASE_LIST), $(wildcard $(d)/bin/i?86*-mingw*-gcc$(HB_HOST_BIN_EXT)))) ifneq ($(MINGW_PREFIX),) MINGW_PREFIX := $(MINGW_PREFIX:gcc$(HB_HOST_BIN_EXT)=) HB_CCPATH := $(dir $(MINGW_PREFIX)) diff --git a/harbour/external/pcre/pcreglob.c b/harbour/external/pcre/pcreglob.c index 6907050678..82460b8b5a 100644 --- a/harbour/external/pcre/pcreglob.c +++ b/harbour/external/pcre/pcreglob.c @@ -53,13 +53,17 @@ differently, and global variables are not used (see pcre.in). */ #include "pcreinal.h" #ifndef VPCOMPAT +#if defined( __cplusplus ) && !defined( __IBMCPP__ ) extern "C" { +#endif PCRE_EXP_DATA_DEFN void *(*pcre_malloc)(size_t) = malloc; PCRE_EXP_DATA_DEFN void (*pcre_free)(void *) = free; PCRE_EXP_DATA_DEFN void *(*pcre_stack_malloc)(size_t) = malloc; PCRE_EXP_DATA_DEFN void (*pcre_stack_free)(void *) = free; PCRE_EXP_DATA_DEFN int (*pcre_callout)(pcre_callout_block *) = NULL; +#if defined( __cplusplus ) && !defined( __IBMCPP__ ) } #endif +#endif /* End of pcre_globals.c */