1 --- php-4.3.0/ext/standard/aggregation.c.orig Thu Dec 5 13:44:21 2002
2 +++ php-4.3.0/ext/standard/aggregation.c Fri Jan 3 10:31:35 2003
5 #include "basic_functions.h"
6 #include "aggregation.h"
7 -#if HAVE_PCRE || HAVE_BUNDLED_PCRE
8 +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
9 #include "ext/pcre/php_pcre.h"
15 zval *list_hash = NULL;
16 -#if HAVE_PCRE || HAVE_BUNDLED_PCRE
17 +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
19 pcre_extra *re_extra = NULL;
22 if (aggr_type == AGGREGATE_BY_LIST) {
23 list_hash = array_to_hash(aggr_filter);
25 -#if HAVE_PCRE || HAVE_BUNDLED_PCRE
26 +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
27 else if (aggr_type == AGGREGATE_BY_REGEXP) {
28 if ((re = pcre_get_compiled_regex(Z_STRVAL_P(aggr_filter), &re_extra, &re_options)) == NULL) {
31 func_name[0] == '_' ||
32 /* 3. explicitly excluded methods */
33 (aggr_type == AGGREGATE_BY_LIST && zend_hash_exists(Z_ARRVAL_P(list_hash), func_name, func_name_len))
34 -#if HAVE_PCRE || HAVE_BUNDLED_PCRE
35 +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
37 /* 4. methods matching regexp as modified by the exclusion flag */
38 (aggr_type == AGGREGATE_BY_REGEXP && (pcre_exec(re, re_extra, func_name, func_name_len-1, 0, 0, NULL, 0) < 0) ^ exclude) == 1
42 zval *list_hash = NULL;
43 -#if HAVE_PCRE || HAVE_BUNDLED_PCRE
44 +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
46 pcre_extra *re_extra = NULL;
49 if (aggr_type == AGGREGATE_BY_LIST) {
50 list_hash = array_to_hash(aggr_filter);
52 -#if HAVE_PCRE || HAVE_BUNDLED_PCRE
53 +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
54 else if (aggr_type == AGGREGATE_BY_REGEXP) {
55 if ((re = pcre_get_compiled_regex(Z_STRVAL_P(aggr_filter), &re_extra, &re_options)) == NULL) {
58 if (prop_name[0] == '_' ||
59 /* 2. explicitly excluded properties */
60 (aggr_type == AGGREGATE_BY_LIST && zend_hash_exists(Z_ARRVAL_P(list_hash), prop_name, prop_name_len))
61 -#if HAVE_PCRE || HAVE_BUNDLED_PCRE
62 +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
64 /* 3. properties matching regexp as modified by the exclusion flag */
65 (aggr_type == AGGREGATE_BY_REGEXP && (pcre_exec(re, re_extra, prop_name, prop_name_len-1, 0, 0, NULL, 0) < 0) ^ exclude) == 1
70 -#if HAVE_PCRE || HAVE_BUNDLED_PCRE
71 +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
72 /* {{{ proto void aggregate_methods_by_regexp(object obj, string class, string regexp [, bool exclude])
74 PHP_FUNCTION(aggregate_methods_by_regexp)
75 --- php-4.3.0/ext/standard/basic_functions.c.orig Fri Dec 20 17:37:44 2002
76 +++ php-4.3.0/ext/standard/basic_functions.c Fri Jan 3 10:42:33 2003
78 PHP_FE(aggregate_methods_by_list, first_arg_force_ref)
79 PHP_FE(aggregate_properties, first_arg_force_ref)
80 PHP_FE(aggregate_properties_by_list, first_arg_force_ref)
81 -#if HAVE_PCRE || HAVE_BUNDLED_PCRE
82 +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
83 PHP_FE(aggregate_methods_by_regexp, first_arg_force_ref)
84 PHP_FE(aggregate_properties_by_regexp, first_arg_force_ref)