cvs: /php3/functions pcre.c php3_pcre.h

fmk Sun Jan 9 02:35:13 2000 EDT Modified files: /php3/functions pcre.c php3_pcre.h Log: Making pcre-module compile and link under Win32 Index: php3/functions/pcre.c diff -u php3/functions/pcre.c:1.20 php3/functions/pcre.c:1.21 --- php3/functions/pcre.c:1.20 Fri Dec 31 20:31:16 1999 +++ php3/functions/pcre.c Sun Jan 9 02:35:13 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pcre.c,v 1.20 2000/01/01 04:31:16 sas Exp $ */ +/* $Id: pcre.c,v 1.21 2000/01/09 10:35:13 fmk Exp $ */ #include "php.h" @@ -59,6 +59,10 @@ php_info_pcre, STANDARD_MODULE_PROPERTIES }; +#if COMPILE_DL +DLEXPORT php3_module_entry *get_module(void) { return &pcre_module_entry; } +#endif + /* }}} */ @@ -343,7 +347,7 @@ /* Make sure to clean up the passed array and initialize it. */ if (subpats != NULL) { - pval_destructor(subpats _INLINE_TLS); + php3tls_pval_destructor(subpats _INLINE_TLS); array_init(subpats); } @@ -427,7 +431,7 @@ } } - php_pcre_free(stringlist); + php_pcre_free((void *)stringlist); /* Advance to the position right after the last full match */ piece += offsets[1]; Index: php3/functions/php3_pcre.h diff -u php3/functions/php3_pcre.h:1.7 php3/functions/php3_pcre.h:1.8 --- php3/functions/php3_pcre.h:1.7 Fri Dec 31 20:44:09 1999 +++ php3/functions/php3_pcre.h Sun Jan 9 02:35:13 2000 @@ -27,12 +27,15 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_pcre.h,v 1.7 2000/01/01 04:44:09 sas Exp $ */ +/* $Id: php3_pcre.h,v 1.8 2000/01/09 10:35:13 fmk Exp $ */ #ifndef _PHP_PCRE_H #define _PHP_PCRE_H #if HAVE_PCRE +#if COMPILE_DL +#include "dl/phpdl.h" +#endif #include "modules.h" #include "internal_functions.h"