]>
Commit | Line | Data |
---|---|---|
19c76606 AG |
1 | since php-7.3.0 array_init() and array_init_size() are converted into macros |
2 | calling zend_new_array(). They are not functions anymore and don't return | |
3 | any values. | |
4 | ||
5 | this change was introduced in following commit: | |
6 | https://github.com/php/php-src/commit/44e0b79ac64b344fc1335c126e548f00d8308602 | |
7 | ||
8 | --- cups-filters-1.21.4/scripting/php/phpcups.c 2018-11-24 19:42:09.905418408 +0100 | |
9 | +++ cups-filters-1.21.4.orig/scripting/php/phpcups.c 2018-11-24 19:40:21.903078482 +0100 | |
10 | @@ -297,7 +297,11 @@ | |
11 | RETURN_NULL(); | |
12 | } | |
13 | ||
14 | +#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 3 | |
15 | + array_init(return_value); | |
16 | +#else | |
17 | if (array_init(return_value) == SUCCESS) | |
18 | +#endif | |
19 | { | |
20 | for (i = 0, dest = dests; i < num_dests; i ++, dest ++) | |
21 | { | |
22 | @@ -329,7 +333,11 @@ | |
23 | MAKE_STD_ZVAL(optionsobj); | |
24 | #endif | |
25 | ||
26 | +#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 3 | |
27 | + array_init(optionsobj); | |
28 | +#else | |
29 | if (array_init(optionsobj) == SUCCESS) | |
30 | +#endif | |
31 | { | |
32 | for (j = 0, option = dest->options; | |
33 | j < dest->num_options; | |
34 | @@ -383,7 +391,12 @@ | |
35 | RETURN_NULL(); | |
36 | } | |
37 | ||
38 | + | |
39 | +#if PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 3 | |
40 | + array_init(return_value); | |
41 | +#else | |
42 | if (array_init(return_value) == SUCCESS) | |
43 | +#endif | |
44 | { | |
45 | for (i = 0, job = jobs; i < num_jobs; i ++, job ++) | |
46 | { |