2009-09-12 16:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* external/pcre/pcreglob.c
    ! Fixed watcom compilation. There are still warnings.
      Please review it.

  * external/pcre/config.h
  * external/pcre/Makefile
    * -DPCRE_STATIC moved to Makefile from config.h. There is 
      no dynlib build mode here, so this could be done.
This commit is contained in:
Viktor Szakats
2009-09-12 14:47:55 +00:00
parent 218e2dd11a
commit 1e8519b5b7
4 changed files with 14 additions and 4 deletions

View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-12 16:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* external/pcre/pcreglob.c
! Fixed watcom compilation. There are still warnings.
Please review it.
* external/pcre/config.h
* external/pcre/Makefile
* -DPCRE_STATIC moved to Makefile from config.h. There is
no dynlib build mode here, so this could be done.
2009-09-12 15:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/bsd/gcc.mk
* config/hpux/gcc.mk

View File

@@ -34,6 +34,8 @@ LIBNAME := hbpcre
ifneq ($(HB_HAS_PCRE_LOCAL),)
HB_CFLAGS += -DPCRE_STATIC
# workaround for problems in sunpro x86 PIC builds exploited by hbpcre library code
ifeq ($(HB_COMPILER),sunpro)
ifeq ($(HB_PLATFORM),sunos)

View File

@@ -1,10 +1,6 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
#if !defined( HB_DYNLIB )
#define PCRE_STATIC
#endif
/* On Unix-like systems config.h.in is converted by "configure" into config.h.
Some other environments also support the use of "configure". PCRE is written in
Standard C, but there are a few non-standard things it can cope with, allowing

View File

@@ -53,11 +53,13 @@ differently, and global variables are not used (see pcre.in). */
#include "pcreinal.h"
#ifndef VPCOMPAT
extern "C" {
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;
}
#endif
/* End of pcre_globals.c */