cvs: php4(PHP_4_3) /ext/standard aggregation.c
| From: | Jani Taskinen | Date: | Sun, 09 Feb 2003 18:47:30 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/standard aggregation.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18556@lists.php.net to get a copy of this message | ||
sniper Sun Feb 9 13:47:30 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard aggregation.c
Log:
MFH
Index: php4/ext/standard/aggregation.c
diff -u php4/ext/standard/aggregation.c:1.11.4.2 php4/ext/standard/aggregation.c:1.11.4.3
--- php4/ext/standard/aggregation.c:1.11.4.2 Tue Dec 31 11:35:23 2002
+++ php4/ext/standard/aggregation.c Sun Feb 9 13:47:30 2003
@@ -16,12 +16,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: aggregation.c,v 1.11.4.2 2002/12/31 16:35:23 sebastian Exp $ */
+/* $Id: aggregation.c,v 1.11.4.3 2003/02/09 18:47:30 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
@@ -77,7 +77,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;
@@ -89,7 +89,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;
@@ -119,7 +119,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
@@ -178,7 +178,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;
@@ -195,7 +195,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;
@@ -223,7 +223,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