sniper Sun Feb 9 13:47:21 2003 EDT
Modified files:
/php4/ext/standard aggregation.c
Log:
Let this compile even if PCRE is compiled as shared in same build.
Index: php4/ext/standard/aggregation.c
diff -u php4/ext/standard/aggregation.c:1.16 php4/ext/standard/aggregation.c:1.17
--- php4/ext/standard/aggregation.c:1.16 Tue Feb 4 08:12:47 2003
+++ php4/ext/standard/aggregation.c Sun Feb 9 13:47:21 2003
@@ -16,12 +16,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: aggregation.c,v 1.16 2003/02/04 13:12:47 zeev Exp $ */
+/* $Id: aggregation.c,v 1.17 2003/02/09 18:47:21 sniper Exp $ */
#include "php.h"
#include "basic_functions.h"
#include "aggregation.h"
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
#include "ext/pcre/php_pcre.h"
#endif
@@ -86,7 +86,7 @@
uint func_name_len;
ulong num_key;
zval *list_hash = NULL;
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
pcre *re = NULL;
pcre_extra *re_extra = NULL;
int re_options = 0;
@@ -98,7 +98,7 @@
if (aggr_type == AGGREGATE_BY_LIST) {
list_hash = array_to_hash(aggr_filter);
}
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
else if (aggr_type == AGGREGATE_BY_REGEXP) {
if ((re = pcre_get_compiled_regex(Z_STRVAL_P(aggr_filter), &re_extra,
&re_options)) == NULL) {
return;
@@ -128,7 +128,7 @@
func_name[0] == '_' ||
/* 3. explicitly excluded methods */
(aggr_type == AGGREGATE_BY_LIST &&
zend_hash_exists(Z_ARRVAL_P(list_hash), func_name, func_name_len))
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
||
/* 4. methods matching regexp as modified by the exclusion
flag */
(aggr_type == AGGREGATE_BY_REGEXP && (pcre_exec(re,
re_extra, func_name, func_name_len-1, 0, 0, NULL, 0) < 0) ^ exclude) == 1
@@ -187,7 +187,7 @@
uint prop_name_len;
ulong num_key;
zval *list_hash = NULL;
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
pcre *re = NULL;
pcre_extra *re_extra = NULL;
int re_options = 0;
@@ -204,7 +204,7 @@
if (aggr_type == AGGREGATE_BY_LIST) {
list_hash = array_to_hash(aggr_filter);
}
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
else if (aggr_type == AGGREGATE_BY_REGEXP) {
if ((re = pcre_get_compiled_regex(Z_STRVAL_P(aggr_filter), &re_extra,
&re_options)) == NULL) {
return;
@@ -232,7 +232,7 @@
if (prop_name[0] == '_' ||
/* 2. explicitly excluded properties */
(aggr_type == AGGREGATE_BY_LIST &&
zend_hash_exists(Z_ARRVAL_P(list_hash), prop_name, prop_name_len))
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
||
/* 3. properties matching regexp as modified by the exclusion
flag */
(aggr_type == AGGREGATE_BY_REGEXP && (pcre_exec(re,
re_extra, prop_name, prop_name_len-1, 0, 0, NULL, 0) < 0) ^ exclude) == 1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
