]>
Commit | Line | Data |
---|---|---|
90c52aee JB |
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 | |
3 | @@ -21,7 +21,7 @@ | |
4 | #include "php.h" | |
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" | |
10 | #endif | |
11 | ||
12 | @@ -77,7 +77,7 @@ | |
13 | uint func_name_len; | |
14 | ulong num_key; | |
15 | zval *list_hash = NULL; | |
16 | -#if HAVE_PCRE || HAVE_BUNDLED_PCRE | |
17 | +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) | |
18 | pcre *re = NULL; | |
19 | pcre_extra *re_extra = NULL; | |
20 | int re_options = 0; | |
21 | @@ -89,7 +89,7 @@ | |
22 | if (aggr_type == AGGREGATE_BY_LIST) { | |
23 | list_hash = array_to_hash(aggr_filter); | |
24 | } | |
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) { | |
29 | return; | |
30 | @@ -119,7 +119,7 @@ | |
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) | |
36 | || | |
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 | |
39 | @@ -178,7 +178,7 @@ | |
40 | uint prop_name_len; | |
41 | ulong num_key; | |
42 | zval *list_hash = NULL; | |
43 | -#if HAVE_PCRE || HAVE_BUNDLED_PCRE | |
44 | +#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) | |
45 | pcre *re = NULL; | |
46 | pcre_extra *re_extra = NULL; | |
47 | int re_options = 0; | |
48 | @@ -195,7 +195,7 @@ | |
49 | if (aggr_type == AGGREGATE_BY_LIST) { | |
50 | list_hash = array_to_hash(aggr_filter); | |
51 | } | |
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) { | |
56 | return; | |
57 | @@ -223,7 +223,7 @@ | |
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) | |
63 | || | |
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 | |
66 | @@ -508,7 +508,7 @@ | |
67 | } | |
68 | /* }}} */ | |
69 | ||
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]) | |
73 | */ | |
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 | |
77 | @@ -862,7 +862,7 @@ | |
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) | |
85 | #endif |