php3_realpath.c -> php_realpath.c

diff --git a/ChangeLog b/ChangeLog
index 0d4bc4f6418f36b2035ea3ae1e7131319646596f..56d6e18ab88ed64817db431e93072320f3fffed0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -585,7 +585,7 @@
       ext/filepro/filepro.c
       main.h
       php.h
-      php3_realpath.c
+      php_realpath.c
       php_realpath.h
       safe_mode.h
       config.guess
@@ -7871,7 +7871,7 @@
       output.c
       output.h
       php.h
-      php3_realpath.c
+      php_realpath.c
       php3_realpath.h
       php_sprintf.c
       php_globals.h
@@ -10394,7 +10394,7 @@
       fopen-wrappers.c
       main.c
       mod_php3.c
-      php3_realpath.c
+      php_realpath.c
       request_info.c
       safe_mode.c
       tls.c: Remove tls.[ch]
@@ -11603,7 +11603,7 @@
       php_ini.h
       php_version.h: PHP 4.0
 
-    * php3_realpath.c
+    * php_realpath.c
       php3_realpath.h
       php_sprintf.c
       php3_threads.c
@@ -11611,7 +11611,7 @@
       php3extra.dsw
       php3sapi.dsw: New file.
 
-    * php3_realpath.c
+    * php_realpath.c
       php3_realpath.h
       php_sprintf.c
       php3_threads.c

diff --git a/Makefile.am b/Makefile.am
index a5fedaf1499d6675d478a122795ace81b03ec010..134a8b6cb2f2751eb4606b0435856291c167e9fc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ phptemp_LTLIBRARIES = libphp4.la
 libphp4_la_SOURCES = \
        main.c internal_functions.c snprintf.c php_sprintf.c \
        configuration-parser.y configuration-scanner.l request_info.c \
-       safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c \
+       safe_mode.c fopen-wrappers.c php_realpath.c alloca.c \
        php_ini.c SAPI.c rfc1867.c dlist.c php_content_types.c strlcpy.c \
        strlcat.c mergesort.c reentrancy.c
 

diff --git a/php3_realpath.c b/main/php_realpath.c
similarity index 100%
rename from php3_realpath.c
rename to main/php_realpath.c

diff --git a/php4dll.dsp b/php4dll.dsp
index 0fefd329f73bfa065dfd86f08cb6f855e9278bac..d5ca6d636e8dd3b342cac18d2d0eb05ba515d54c 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -131,7 +131,7 @@ SOURCE=.\ext\standard\output.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php3_realpath.c\r
+SOURCE=.\php_realpath.c\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 2c50090e6c16fc6adcef013cf79e6f330faf2b1b..ae48fe404d2855262045984e2d75852fa79353d0 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -127,7 +127,7 @@ SOURCE=.\mergesort.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\php3_realpath.c\r
+SOURCE=.\php_realpath.c\r
 # End Source File\r
 # Begin Source File\r
 \r