Rename HAVE_PHP_STREAM to PHP_HAVE_STREAMS, because

1.) a PHP-specific symbol should be in the php namespace, and
2.) there are multiple streams and the old configure parameter was plural, too.

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index dee722ab5926c24f393d3172860e7f6219abd3d2..2e98ffe7a64cf29eee396efcc3cb3cb0c023367b 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -623,7 +623,7 @@ function_entry basic_functions[] = {
        PHP_FE(set_socket_blocking,                                                                                             NULL)
        PHP_FE(socket_set_blocking,                                                                                             NULL)
 
-#if HAVE_PHP_STREAM
+#if PHP_HAVE_STREAMS
        PHP_FE(fgetwrapperdata,                                                                                                 NULL)
 #endif
 

diff --git a/main/php.h b/main/php.h
index e086ee4ed5c656a13e67d59dc68c6d9f5cc54eee..c1d794955022f0ddbaeea289ab6a960d06379572 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -27,7 +27,7 @@
 #endif
 
 #define PHP_API_VERSION 20010901
-#define HAVE_PHP_STREAM 1
+#define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 
 #include "php_version.h"