warning C4232: nonstandard extension used : 'pcre_malloc' : address of
dllimport 'malloc' is not static, identity not guaranteed
This commit is contained in:
@@ -365,11 +365,6 @@ extern "C"
|
|||||||
int (*pcre_callout)(pcre_callout_block *) = NULL;
|
int (*pcre_callout)(pcre_callout_block *) = NULL;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
void *(*pcre_malloc)(size_t) = malloc;
|
|
||||||
void (*pcre_free)(void *) = free;
|
|
||||||
void *(*pcre_stack_malloc)(size_t) = malloc;
|
|
||||||
void (*pcre_stack_free)(void *) = free;
|
|
||||||
int (*pcre_callout)(pcre_callout_block *) = NULL;
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -5898,6 +5893,7 @@ for (;;)
|
|||||||
function is able to force a failure. */
|
function is able to force a failure. */
|
||||||
|
|
||||||
case OP_CALLOUT:
|
case OP_CALLOUT:
|
||||||
|
#if 0
|
||||||
if (pcre_callout != NULL)
|
if (pcre_callout != NULL)
|
||||||
{
|
{
|
||||||
pcre_callout_block cb;
|
pcre_callout_block cb;
|
||||||
@@ -5914,6 +5910,7 @@ for (;;)
|
|||||||
if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
|
if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
|
||||||
if (rrc < 0) RRETURN(rrc);
|
if (rrc < 0) RRETURN(rrc);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
ecode += 2;
|
ecode += 2;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@@ -146,11 +146,11 @@ it is null on other OS. For Virtual Pascal, these have to be different again.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef VPCOMPAT
|
#ifndef VPCOMPAT
|
||||||
PCRE_DATA_SCOPE void *(*pcre_malloc)(size_t);
|
#define pcre_malloc malloc
|
||||||
PCRE_DATA_SCOPE void (*pcre_free)(void *);
|
#define pcre_free free
|
||||||
PCRE_DATA_SCOPE void *(*pcre_stack_malloc)(size_t);
|
#define pcre_stack_malloc malloc
|
||||||
PCRE_DATA_SCOPE void (*pcre_stack_free)(void *);
|
#define pcre_stack_free free
|
||||||
PCRE_DATA_SCOPE int (*pcre_callout)(pcre_callout_block *);
|
#define pcre_callout NULL
|
||||||
#else /* VPCOMPAT */
|
#else /* VPCOMPAT */
|
||||||
extern void *pcre_malloc(size_t);
|
extern void *pcre_malloc(size_t);
|
||||||
extern void pcre_free(void *);
|
extern void pcre_free(void *);
|
||||||
|
|||||||
Reference in New Issue
Block a user