HEAD doesnt compile

Can no longer compile HEAD. When replacing PHP_ARRAY_CMP_FUNC_VARS in the 2 static functions with the actual variable definitions it compiles fine. /home/rrichards/php5/ext/standard/array.c: In function `php_array_intersect': /home/rrichards/php5/ext/standard/array.c:2864: parse error before `int' /home/rrichards/php5/ext/standard/array.c:2879: `intersect_key_compare_func' undeclared (first use in this function) /home/rrichards/php5/ext/standard/array.c:2879: (Each undeclared identifier is reported only once /home/rrichards/php5/ext/standard/array.c:2879: for each function it appears in.) /home/rrichards/php5/ext/standard/array.c:2888: `intersect_data_compare_func' undeclared (first use in this function) /home/rrichards/php5/ext/standard/array.c:3051: `intersect_data_compare_func' used prior to declaration /home/rrichards/php5/ext/standard/array.c:3051: warning: implicit declaration of function `intersect_data_compare_func' /home/rrichards/php5/ext/standard/array.c:3055: `intersect_key_compare_func' used prior to declaration /home/rrichards/php5/ext/standard/array.c:3055: warning: implicit declaration of function `intersect_key_compare_func' /home/rrichards/php5/ext/standard/array.c:3069: `intersect_data_compare_func' used prior to declaration /home/rrichards/php5/ext/standard/array.c:3115: `intersect_data_compare_func' used prior to declaration /home/rrichards/php5/ext/standard/array.c:3131: `intersect_data_compare_func' used prior to declaration /home/rrichards/php5/ext/standard/array.c: In function `php_array_diff': /home/rrichards/php5/ext/standard/array.c:3239: parse error before `int' /home/rrichards/php5/ext/standard/array.c:3255: `diff_key_compare_func' undeclared (first use in this function) /home/rrichards/php5/ext/standard/array.c:3264: `diff_data_compare_func' undeclared (first use in this function) /home/rrichards/php5/ext/standard/array.c:3427: `diff_data_compare_func' used prior to declaration /home/rrichards/php5/ext/standard/array.c:3427: warning: implicit declaration of function `diff_data_compare_func' /home/rrichards/php5/ext/standard/array.c:3431: `diff_key_compare_func' used prior to declaration /home/rrichards/php5/ext/standard/array.c:3431: warning: implicit declaration of function `diff_key_compare_func' /home/rrichards/php5/ext/standard/array.c:3450: `diff_data_compare_func' used prior to declaration /home/rrichards/php5/ext/standard/array.c:3489: `diff_data_compare_func' used prior to declaration /home/rrichards/php5/ext/standard/array.c:3505: `diff_data_compare_func' used prior to declaration make: *** [ext/standard/array.lo] Error 1 Rob