Finish fopen-wrappers rename.

diff --git a/ext/db/db.c b/ext/db/db.c
index 8923c8094c46d92766ee81dbb132618af451e18e..146f4bb7873e462a3999f19cf5a78e19594082a1 100644 (file)
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -25,7 +25,7 @@
 #include "php.h"
 #include "php_globals.h"
 #include "safe_mode.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include "ext/standard/flock_compat.h" 
 #include "ext/standard/info.h"
 

diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index a6c5bf1557ef2d9b10f7c6f028eb510e7242f169..b0624b881de647c985e051c0fad76e3f751d29d6 100644 (file)
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -24,7 +24,7 @@
 
 #include "php.h"
 #include "safe_mode.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include "php_globals.h"
 
 #if DBASE

diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c
index 6b7a3b60618bddfdc3a727d3af0286d188318807..f1b7bee7e15a33a7e16b6f66ad9f0cac5d701adc 100644 (file)
--- a/ext/filepro/filepro.c
+++ b/ext/filepro/filepro.c
@@ -28,7 +28,7 @@
 
 #include "php.h"
 #include "safe_mode.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include <string.h>
 #ifdef PHP_WIN32
 #include <windows.h>

diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index dd32515d255dceba44e935d7cd3355e770ea80f1..f9d03ab00e742d3f6f71c8da600be88782f58c07 100644 (file)
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -26,7 +26,7 @@
 #include "ext/standard/php_standard.h"
 #include "ext/standard/head.h"
 #include "ext/standard/info.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include "SAPI.h"
 
 #ifdef PHP_WIN32

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 89f4f797c046af741e1f910efd5575036a2c35f7..ff108a3fad46e201896d1094664cc3443268c532 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -22,7 +22,7 @@
 /* {{{ includes/startup/misc */
 
 #include "php.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 
 #include "php_dir.h"
 

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 6f8b05e351a1bc1e4e7aed6ef1d497ba6fd9bffc..458df70323cc1a40fd661714c5220670b86d3e78 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -69,7 +69,7 @@
 #include <sys/time.h>
 #endif
 #include "fsock.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include "php_globals.h"
 
 #ifdef HAVE_SYS_FILE_H

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 819841f82a18ebec1e3f7244a26319c68b069a36..f30f7642a204ae143a4f771bc75958724fa514d3 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -20,7 +20,7 @@
 
 #include "php.h"
 #include "safe_mode.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include "php_globals.h"
 
 #include <stdlib.h>

diff --git a/ext/standard/image.c b/ext/standard/image.c
index f33f5e6b540a38d5fa6cff4c115303a46c1bbfe4..5a971cbf5c3ff2c97c1315207691030f3fafec8c 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -41,7 +41,7 @@
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include "ext/standard/fsock.h"
 #if HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index a8fc9cdd76548a67a17b7331da7074a476a70287..afbf9738ae8f0076a5998bc0ce581012eb231d3b 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -41,7 +41,7 @@
 #include "ext/standard/php_standard.h"
 #include "ext/standard/info.h"
 #include "php_zlib.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #if HAVE_PWD_H
 #ifdef PHP_WIN32
 #include "win32/pwd.h"

diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c
index d1ac036d576ce7ebb9a3f33935bd806e1ff22d23..c2674af4c16e82dee7912b08b3dfeb72c101f593 100644 (file)
--- a/ext/zlib/zlib_fopen_wrapper.c
+++ b/ext/zlib/zlib_fopen_wrapper.c
@@ -21,7 +21,7 @@
 
 #include "php.h"
 #include "php_zlib.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 
 #if HAVE_FOPENCOOKIE 
 

diff --git a/main/Makefile.in b/main/Makefile.in
index e75be073ffe5b15565ca62a0384eab97b5801b6c..e573d639d13f36575595db3338fc9134e16cead8 100644 (file)
--- a/main/Makefile.in
+++ b/main/Makefile.in
@@ -2,7 +2,7 @@ LTLIBRARY_NAME = libmain.la
 
 LTLIBRARY_SOURCES = \
        main.c internal_functions.c snprintf.c php_sprintf.c \
-       safe_mode.c fopen-wrappers.c alloca.c \
+       safe_mode.c fopen_wrappers.c alloca.c \
        php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
        strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
        network.c php_open_temporary_file.c php_logos.c

diff --git a/main/main.c b/main/main.c
index 1bc3cdf3221a9b2756e4cf45864d112e8be555a6..ffea429b98aee4e1db1af38ef0b0eabacf85470f 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -48,7 +48,7 @@
 #include "php_ini.h"
 #include "php_globals.h"
 #include "php_main.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include "ext/standard/php_standard.h"
 #include "php_variables.h"
 #include "ext/standard/credits.h"

diff --git a/main/php.h b/main/php.h
index a15786e395612f60b21b633c2d53b72cbd70db4f..a045870047d9a9777c8e093ee79ef86af15e4bee 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -161,7 +161,7 @@ typedef unsigned int socklen_t;
 char *strerror(int);
 #endif
 
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 
 #if (REGEX == 1 || REGEX == 0) && !defined(NO_REGEX_EXTRA_H)
 #include "regex/regex_extra.h"

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 0163867c5b9607b2923b31b3ea79504663357c6d..f215bd9a146e6b280ca4a0d459c3df2b5a220edd 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -52,7 +52,7 @@
 #include "php_ini.h"
 #include "php_globals.h"
 #include "php_main.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include "ext/standard/php_standard.h"
 #ifdef PHP_WIN32
 #include <io.h>

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index 061186de274eda6040974062a903247f612ddf0a..cd434be69ee1bfbcb73feb3c31f88b5b5b8f9be6 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -48,7 +48,7 @@
 #include "php_ini.h"
 #include "php_globals.h"
 #include "php_main.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
 #include "ext/standard/php_standard.h"
 #include "ext/standard/php_dir.h"
 #ifdef PHP_WIN32