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

@@ -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.

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))

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 */