diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-10-19 09:49:28 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-10-19 09:49:28 +0200 |
| commit | 276c5de0d86abab52a19f489dd74565fdec0d3ca (patch) | |
| tree | 7b3b16c9ce208a34968f39dad680c42ad4ba7a6f /ext/pcre/pcrelib/pcre_maketables.c | |
| parent | 90bd54c46e0195f65a1a49ac0c01f139915a2dd3 (diff) | |
| download | php-git-276c5de0d86abab52a19f489dd74565fdec0d3ca.tar.gz | |
Fixed bug #63284 PCRE upgrade to 8.31
Diffstat (limited to 'ext/pcre/pcrelib/pcre_maketables.c')
| -rw-r--r-- | ext/pcre/pcrelib/pcre_maketables.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ext/pcre/pcrelib/pcre_maketables.c b/ext/pcre/pcrelib/pcre_maketables.c index 2ba612cec7..5c73b75f74 100644 --- a/ext/pcre/pcrelib/pcre_maketables.c +++ b/ext/pcre/pcrelib/pcre_maketables.c @@ -6,7 +6,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel - Copyright (c) 1997-2008 University of Cambridge + Copyright (c) 1997-2012 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -57,21 +57,26 @@ compilation of dftables.c, in which case the macro DFTABLES is defined. */ /* This function builds a set of character tables for use by PCRE and returns a pointer to them. They are build using the ctype functions, and consequently their contents will depend upon the current locale setting. When compiled as -part of the library, the store is obtained via pcre_malloc(), but when compiled -inside dftables, use malloc(). +part of the library, the store is obtained via PUBL(malloc)(), but when +compiled inside dftables, use malloc(). Arguments: none Returns: pointer to the contiguous block of data */ +#ifdef COMPILE_PCRE8 const unsigned char * pcre_maketables(void) +#else +const unsigned char * +pcre16_maketables(void) +#endif { unsigned char *yield, *p; int i; #ifndef DFTABLES -yield = (unsigned char*)(pcre_malloc)(tables_length); +yield = (unsigned char*)(PUBL(malloc))(tables_length); #else yield = (unsigned char*)malloc(tables_length); #endif |