From c2fb53bed76d5e7c2aa6fbe69d98c3c442255a00 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Fri, 23 Feb 2001 22:07:16 +0000 Subject: [PATCH] Finish fopen-wrappers rename. --- ext/db/db.c | 2 +- ext/dbase/dbase.c | 2 +- ext/filepro/filepro.c | 2 +- ext/hyperwave/hw.c | 2 +- ext/standard/dir.c | 2 +- ext/standard/file.c | 2 +- ext/standard/filestat.c | 2 +- ext/standard/image.c | 2 +- ext/zlib/zlib.c | 2 +- ext/zlib/zlib_fopen_wrapper.c | 2 +- main/Makefile.in | 2 +- main/main.c | 2 +- main/php.h | 2 +- sapi/cgi/cgi_main.c | 2 +- sapi/servlet/servlet.c | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ext/db/db.c b/ext/db/db.c index 8923c8094c..146f4bb787 100644 --- 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 a6c5bf1557..b0624b881d 100644 --- 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 6b7a3b6061..f1b7bee7e1 100644 --- 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 #ifdef PHP_WIN32 #include diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index dd32515d25..f9d03ab00e 100644 --- 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 89f4f797c0..ff108a3fad 100644 --- 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 6f8b05e351..458df70323 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -69,7 +69,7 @@ #include #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 819841f82a..f30f7642a2 100644 --- 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 diff --git a/ext/standard/image.c b/ext/standard/image.c index f33f5e6b54..5a971cbf5c 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -41,7 +41,7 @@ #if HAVE_FCNTL_H #include #endif -#include "fopen-wrappers.h" +#include "fopen_wrappers.h" #include "ext/standard/fsock.h" #if HAVE_UNISTD_H #include diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index a8fc9cdd76..afbf9738ae 100644 --- 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 d1ac036d57..c2674af4c1 100644 --- 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 e75be073ff..e573d639d1 100644 --- 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 1bc3cdf322..ffea429b98 100644 --- 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 a15786e395..a045870047 100644 --- 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 0163867c5b..f215bd9a14 100644 --- 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 diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index 061186de27..cd434be69e 100644 --- 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 -- 2.40.0