[phpng] PHP7 with ZTS: use of undeclared identifier 'ERROR'

[J5lx]

I just successfully rebuilt PHP7 beta 1 with ZTS enabled. However, when trying to rebuild ext-http I get the following error:

...
 clang -I. -I/home/jakob/Downloads/ext-http -DPHP_ATOM_INC -I/home/jakob/Downloads/ext-http/include -I/home/jakob/Downloads/ext-http/main -I/home/jakob/Downloads/ext-http -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib -I/usr/include/php/ext/raphf -I/usr/include/php/ext/propro -I/usr/include/php/ext/hash -DHAVE_CONFIG_H -g -O0 -c /home/jakob/Downloads/ext-http/php_http_client_curl.c  -fPIC -DPIC -o .libs/php_http_client_curl.o
/home/jakob/Downloads/ext-http/php_http_client_curl.c:223:2: error: use of
      undeclared identifier 'ERROR'
        TSRMLS_FETCH_FROM_CTX(body->ts);
        ^
./php_http_api.h:124:37: note: expanded from macro 'TSRMLS_FETCH_FROM_CTX'
#       define TSRMLS_FETCH_FROM_CTX(ctx) ERROR
                                          ^
/home/jakob/Downloads/ext-http/php_http_client_curl.c:1646:2: error: use of
      undeclared identifier 'ERROR'
        TSRMLS_FETCH_FROM_CTX(client->ts);
        ^
./php_http_api.h:124:37: note: expanded from macro 'TSRMLS_FETCH_FROM_CTX'
#       define TSRMLS_FETCH_FROM_CTX(ctx) ERROR
                                          ^
/home/jakob/Downloads/ext-http/php_http_client_curl.c:2417:2: error: use of
      undeclared identifier 'ERROR'
        TSRMLS_FETCH_FROM_CTX(h->ts);
        ^
./php_http_api.h:124:37: note: expanded from macro 'TSRMLS_FETCH_FROM_CTX'
#       define TSRMLS_FETCH_FROM_CTX(ctx) ERROR
                                          ^
3 errors generated.
Makefile:200: recipe for target 'php_http_client_curl.lo' failed
make: *** [php_http_client_curl.lo] Error 1

When compiling with gcc instead of clang the error messages differ, but not the error itself, so I'm pretty sure this isn't related to the compiler.

[m6w6]

Should be fixed by 8840a33

[J5lx]

Yep, thanks!