- Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5

author: foobar <sniper@php.net> 2004-01-17 13:00:38 +0000
committer: foobar <sniper@php.net> 2004-01-17 13:00:38 +0000
commit: f4983c0d3f56c2074458e4840db36643b2fec59b (patch)
tree: 2dcf521f07114e3bb2952439fe28cdfa40d30677 /win32
parent: b851f3712388de9f6c4addf2063dbc3c663a0b3b (diff)
download: php-git-f4983c0d3f56c2074458e4840db36643b2fec59b.tar.gz
21 files changed, 536 insertions, 536 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index b56ba24bd0..457b8dcec6 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -32,7 +32,7 @@ DEFINE('PHP_PREFIX', PHP_PREFIX);
 DEFINE("BASE_INCLUDES", "/I . /I main /I regex /I Zend /I TSRM ");
 
 // CFLAGS for building the PHP dll
-DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP4DLLTS_EXPORTS /D PHP_EXPORTS \
+DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \
 /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x400");
 
 DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
diff --git a/win32/install.txt b/win32/install.txt
index 8af4c966ba..9374570f33 100644
--- a/win32/install.txt
+++ b/win32/install.txt
@@ -54,9 +54,9 @@ Windows Manual installation from zip binary distribution
   Xitami
   SunONE Webserver, Netscape Enterprise Server, iPlanet
 
- PHP 4 for Windows comes in two flavours - a CGI executable (php.exe),
- and several SAPI modules (for exapmle php4isapi.dll). The latter form
- is new to PHP 4, and provides significantly improved performance and
+ PHP for Windows comes in two flavours - a CGI executable (php.exe),
+ and several SAPI modules (for exapmle php5isapi.dll). The latter form
+ is new to PHP, and provides significantly improved performance and
  some new functionality. However, please note that the SAPI modules
  are *NOT* yet considered to be production quality.
  In particular, with the ISAPI module, you are likely to encounter serious
@@ -65,7 +65,7 @@ Windows Manual installation from zip binary distribution
  such as ASP also failing. You have been warned!
 
  The reason for this is that the PHP SAPI modules are using the
- thread-safe version of the PHP code, which is new to PHP 4, and has
+ thread-safe version of the PHP code, which is new to PHP, and has
  not yet been tested and pounded enough to be considered completely
  stable, and there are actually a few known bugs. On the other hand,
  some people have reported very good results with the SAPI modules,
@@ -90,14 +90,14 @@ Windows Manual installation from zip binary distribution
 
   You need to ensure that the dlls which php uses can be found. The precise
   dlls involved depend on which web server you use and whether you want to
-  run php as a cgi or as a server module. php4ts.dll is always used. If you are
+  run php as a cgi or as a server module. php5ts.dll is always used. If you are
   using a server module (e.g. isapi or apache) then you will need the relevent
   dll from the sapi folder. If you are using any php extension dlls then you
   will need those as well. To make sure that the dlls can be found, you can
   either copy them to the system directory (e.g. winnt/system32 or 
   windows/system) or you can make sure that they live in the same directory
   as the main php executable or dll your web server will use (e.g. php.exe,
-  php4apache.dll).
+  php5apache.dll).
 
   Copy the file, php.ini-dist to your %WINDOWS% directory on
   Windows 95/98 or to your %SYSTEMROOT% directory under Windows NT,
@@ -178,7 +178,7 @@ Installation of Windows extensions
  libraries.
 
  Note:
- In PHP 4.0.5 MySQL, ODBC, FTP, Calendar, BCMath, COM, PCRE,
+ Since PHP 4.0.5 MySQL, ODBC, FTP, Calendar, BCMath, COM, PCRE,
  Session, WDDX and XML support is built-in. You don't need to
  load any additional extensions in order to use these functions.
 
@@ -214,7 +214,7 @@ Web server configuration
       http://www.php.net/manual/en/install.apache2.php
 
    With the basic difference being that when installing as a 
-   module you'll use php4apache2.dll instead of php4apache.dll
+   module you'll use php5apache2.dll instead of php5apache.dll
    Both files are included within this release.
   ------------------------------------------------------------
 
@@ -239,24 +239,24 @@ Web server configuration
   Now that version 4.1 introduces a safer sapi module, we recommend
   that you configure PHP as a module in Apache.
 
-  To accomplish this, you have to load the php4apache.dll in your
+  To accomplish this, you have to load the php5apache.dll in your
   Apache httpd.conf.
 
   !! NOTE !!
-  Whereever you load php4apache.dll from, php4apache.dll also
-  needs the php4ts.dll also included in the PHP4 distribution.
-  php4apache.dll depends on php4ts.dll which is loaded as soon as
-  Apache loads php4apache.dll. If php4ts.dll can't be found, you
+  Whereever you load php5apache.dll from, php5apache.dll also
+  needs the php5ts.dll also included in the PHP distribution.
+  php5apache.dll depends on php5ts.dll which is loaded as soon as
+  Apache loads php5apache.dll. If php5ts.dll can't be found, you
   usually get an error like (also see the "Problems?" section at
   the end of the file):
 
-    Cannot load c:/php/sapi/php4apache.dll into server
+    Cannot load c:/php/sapi/php5apache.dll into server
 
-  So where does php4ts.dll has to be to be properly loaded ?
-  php4ts.dll is searched in the following order:
+  So where does php5ts.dll has to be to be properly loaded ?
+  php5ts.dll is searched in the following order:
 
   1) in the directory where apache.exe is start from
-  2) in the directory where php4apache.dll is loaded from
+  2) in the directory where php5apache.dll is loaded from
   3) in your %SYSTEMROOT%\System32, %SYSTEMROOT%\system and
      %SYSTEMROOT% directory.
      Note: %SYSTEMROOT%\System32 only applies to Windows NT/2000/XP)
@@ -268,15 +268,15 @@ Web server configuration
   Usually you would just copy it over to %SYSTEMROOT%\System32.
   But if you want to have multiple PHP installations (for
   whatever reason) this is a bad idea. For this circumstance the
-  safest thing is to let php4ts.dll reside in the same directory
-  where php4apache.dll is loaded from (see point 2 above).
+  safest thing is to let php5ts.dll reside in the same directory
+  where php5apache.dll is loaded from (see point 2 above).
 
 
   After you've set up the file layout properly, you're ready to
-  finally configure Apache to load the PHP4 module. Just add the
+  finally configure Apache to load the PHP module. Just add the
   following lines to your httpd.conf:
 
-   LoadModule php5_module c:/php/sapi/php4apache.dll
+   LoadModule php5_module c:/php/sapi/php5apache.dll
    AddModule mod_php5.c
    AddType application/x-httpd-php .php
 
@@ -329,15 +329,15 @@ Web server configuration
   On Win-Apache, path names can contain either forward- or backslashes.
   Example:
 
-    LoadModule php5_module C:\php\sapi\php4apache.dll
+    LoadModule php5_module C:\php\sapi\php5apache.dll
 
   works as good as 
 
-    LoadModule php5_module C:/php/sapi/php4apache.dll
+    LoadModule php5_module C:/php/sapi/php5apache.dll
 
   You even can mix the slash-style:
 
-    LoadModule php5_module C:\php/sapi\php4apache.dll
+    LoadModule php5_module C:\php/sapi\php5apache.dll
 
 ----------------------------------------------------------
 
@@ -350,7 +350,7 @@ Web server configuration
   Windows and PWS/IIS 3 - including PWS on Win 9x/ME
 
    The recommended method for configuring these servers is to use
-   the REG file incuded with the distribution (pws-php4cgi.reg).
+   the REG file incuded with the distribution (pws-php5cgi.reg).
    You may want to edit this file and make sure the extensions and PHP
    install directories match your configuration - once you have done
    this, just double click on the file and it will update your registry.
@@ -466,11 +466,11 @@ Web server configuration
     If you don't want to perform HTTP Authentication using PHP,
     you can (and should) skip this step. Under ISAPI Filters,
     add a new ISAPI filter. Use PHP as the filter name, and
-    supply a path to the php4isapi.dll.
+    supply a path to the php5isapi.dll.
 
     Under 'Home Directory', click on the 'Configuration' button.
     Add a new entry to the Application Mappings. Use the path
-    to the php4isapi.dll as the Executable, supply .php as the
+    to the php5isapi.dll as the Executable, supply .php as the
     extension, leave Method exclusions blank, and check the
     Script engine checkbox.
 
@@ -524,7 +524,7 @@ Web server configuration
 
    From the List select "Associations" and enter the desired
    extension (".php") and the path to the CGI exe (ex. c:\php\php.exe)
-   or the ISAPI dll file (ex. c:\php\sapi\php4isapi.dll).
+   or the ISAPI dll file (ex. c:\php\sapi\php5isapi.dll).
 
    Select "Content Types" add the same extension ".php"
    and enter the content type. If you choose the CGI exe
@@ -623,7 +623,7 @@ Web server configuration
 
    Open mappings.ini and add the following line under [isapi]
 
-   *.php = c:\php\php4isapi.dll
+   *.php = c:\php\php5isapi.dll
     Note: The above assumes that PHP was installed in c:\php
 
    Restart the server
@@ -685,7 +685,7 @@ Problems?
    Once php is working at the command line, try accessing the php script via the browser again.
    If it still fails then it could be one of the following:
 
-   file permissions on your php script, php.exe, php4ts.dll, php.ini or any php
+   file permissions on your php script, php.exe, php5ts.dll, php.ini or any php
    extensions you are trying to load are such that the web server cannot access 
    them. For IIS, IUSR_<machinename> needs at least read access.
 
@@ -708,18 +708,18 @@ Problems?
 
   Example scenery:
 
-   Apache/PHP4 as module. Though I've properly configured
-   php4apache.dll in httpd.conf, I always get:
+   Apache/PHP as module. Though I've properly configured
+   php5apache.dll in httpd.conf, I always get:
 
    Syntax error on line 1025 of c:/apache/apache/conf/httpd.conf:
-   Cannot load c:/php/php-4.2.1-win32/sapi/php4apache.dll into server
+   Cannot load c:/php/php-4.2.1-win32/sapi/php5apache.dll into server
 
-   But c:/php/php-4.2.1-win32/sapi/php4apache.dll definitely
+   But c:/php/php-4.2.1-win32/sapi/php5apache.dll definitely
    exists:
 
-   dir c:\php\php-4.2.1-win32\sapi\php4apache.dll
+   dir c:\php\php-4.2.1-win32\sapi\php5apache.dll
     Directory of c:\php\php-4.2.1-win32\sapi
-    13.05.2002  00:01               24.576 php4apache.dll
+    13.05.2002  00:01               24.576 php5apache.dll
 
    'strace'ing the apache.exe binary revealed the following:
    c:
@@ -728,18 +728,18 @@ Problems?
 
    Then looking into strace.txt:
    [...]
-729 3348 3248 NtOpenSection (0xe, {24, 24, 0x40, 0, 0, "php4ts.dll"}, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
-731 3348 3248 NtQueryAttributesFile ({24, 0, 0x40, 0, 0, "\??\c:\php\php-4.2.1-win32\sapi\php4ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
-733 3348 3248 NtQueryAttributesFile ({24, 108, 0x40, 0, 0, "php4ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
-735 3348 3248 NtQueryAttributesFile ({24, 0, 0x40, 0, 0, "\??\C:\WINNT\System32\php4ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
+729 3348 3248 NtOpenSection (0xe, {24, 24, 0x40, 0, 0, "php5ts.dll"}, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
+731 3348 3248 NtQueryAttributesFile ({24, 0, 0x40, 0, 0, "\??\c:\php\php-4.2.1-win32\sapi\php5ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
+733 3348 3248 NtQueryAttributesFile ({24, 108, 0x40, 0, 0, "php5ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
+735 3348 3248 NtQueryAttributesFile ({24, 0, 0x40, 0, 0, "\??\C:\WINNT\System32\php5ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
    [...]
 
    This went on quiet some time for all directories in the %PATH%
    environment variable. The solution finally was to copy
-   php4ts.dll in any of the directories searched by the System (I
+   php5ts.dll in any of the directories searched by the System (I
    prefered to use c:\php\php-4.2.1-win32\sapi).
 
-   Note: This does not only apply to php4ts.dll but in fact to every
+   Note: This does not only apply to php5ts.dll but in fact to every
          DLL which gets loaded through PHP too. So, if you've
          problems running your PHP CLI application because it
          can't load a certain library but you're sure it's there,
diff --git a/win32/installer/README b/win32/installer/README
index 4c79b9a623..0879497db5 100644
--- a/win32/installer/README
+++ b/win32/installer/README
@@ -14,7 +14,7 @@ Installer Layout:
 We have the following features:
 
     o PHP Core - Always installed.
-                 Includes php4ts.dll, php.ini + common dlls
+                 Includes php5ts.dll, php.ini + common dlls
                  and config files
 
     o SAPI
diff --git a/win32/installer/gen-nsis.php b/win32/installer/gen-nsis.php
index 7e9938f4c6..da94264c9e 100644
--- a/win32/installer/gen-nsis.php
+++ b/win32/installer/gen-nsis.php
@@ -22,7 +22,7 @@ $sections = array(
 		"files" => array(
 			"$SYSDIR" => array(
 				"dlls\\*.dll",
-				"php4ts.dll",
+				"php5ts.dll",
 			),
 			"\$INSTDIR" => array(
 				"*.txt",
@@ -42,7 +42,7 @@ $sections = array(
 	  			"php.exe"
 	  		),
 			"\$INSTDIR\\sapi" => array(
-				"sapi\\pws-php4cgi.reg"
+				"sapi\\pws-php5cgi.reg"
 			),
 	  	),
 	),
@@ -171,7 +171,7 @@ function add_sections($pattern, $groupname, $abbrev, &$sections, $sourcedirs, $i
 
 	foreach ($avail as $extname) {
 		/* mangle name */
-		if (preg_match('/(php_|php4|php)([^_].*)\.dll/', basename($extname), $matches)) {
+		if (preg_match('/(php_|php5|php)([^_].*)\.dll/', basename($extname), $matches)) {
 			$ext = $matches[2];
 		} else {
 			$ext = basename($extname);
@@ -388,7 +388,7 @@ Function CopyPHPIni
 	CopyFiles "$INSTDIR\php.ini-dist" "$WINDIR\php.ini"
 
 ; These files will be deleted during post-installation
-	CopyFiles "<?= $SYSDIR ?>\php4ts.dll" "$INSTDIR\php4ts.dll"
+	CopyFiles "<?= $SYSDIR ?>\php5ts.dll" "$INSTDIR\php5ts.dll"
 	File "<?= dirname(__FILE__) ?>\setini.php"
 
 ; Set the extension_dir setting in the php.ini
@@ -411,7 +411,7 @@ Section -post
 
 	Delete "$INSTDIR\.ini-add" ; Created by the AddIniSetting function
 	Delete "$INSTDIR\setini.php"
-	Delete "$INSTDIR\php4ts.dll"
+	Delete "$INSTDIR\php5ts.dll"
 
 	; Add to Add/Remove programs list
 	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PHP-<?= PHPVERSION ?>" "UninstallString" "$INSTDIR\Uninstall.exe"
diff --git a/win32/php4.dsp b/win32/php5.dsp
index 1e8d7f4e45..0b5b9a6d6b 100644
--- a/win32/php4.dsp
+++ b/win32/php5.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=php4 - Win32 Debug
+CFG=php5 - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "php4.mak".
+!MESSAGE NMAKE /f "php5.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "php4.mak" CFG="php4 - Win32 Debug"
+!MESSAGE NMAKE /f "php5.mak" CFG="php5 - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "php4 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4 - Win32 Release_inline" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5 - Win32 Release_inline" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CFG=php4 - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "php4 - Win32 Release"
+!IF  "$(CFG)" == "php5 - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -52,9 +52,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 php4nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php.exe" /libpath:"..\Release"
+# ADD LINK32 php5nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php.exe" /libpath:"..\Release"
 
-!ELSEIF  "$(CFG)" == "php4 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "php5 - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -77,15 +77,15 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"c:\php-fcgi\php.exe" /pdbtype:sept /libpath:"..\Debug"
+# ADD LINK32 winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5nts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"c:\php-fcgi\php.exe" /pdbtype:sept /libpath:"..\Debug"
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "php4 - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5 - Win32 Release_inline"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4___Win32_Release_inline"
-# PROP BASE Intermediate_Dir "php4___Win32_Release_inline"
+# PROP BASE Output_Dir "php5___Win32_Release_inline"
+# PROP BASE Intermediate_Dir "php5___Win32_Release_inline"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
@@ -104,16 +104,16 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 php4nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release\php.exe" /libpath:"Release"
-# ADD LINK32 php4nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php.exe" /libpath:"..\Release_inline"
+# ADD BASE LINK32 php5nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release\php.exe" /libpath:"Release"
+# ADD LINK32 php5nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php.exe" /libpath:"..\Release_inline"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "php4 - Win32 Release"
-# Name "php4 - Win32 Debug"
-# Name "php4 - Win32 Release_inline"
+# Name "php5 - Win32 Release"
+# Name "php5 - Win32 Debug"
+# Name "php5 - Win32 Release_inline"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ".c"
diff --git a/win32/php4.dsw b/win32/php5.dsw
index cd53cde27d..d6efc98ee2 100644
--- a/win32/php4.dsw
+++ b/win32/php5.dsw
@@ -1,107 +1,107 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Zend"=..\Zend\Zend.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name TSRM
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "fastcgi"=..\sapi\fastcgi\fastcgi.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name php4dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name TSRM
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name Zend
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "php4"=.\php4.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name php4dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name Zend
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name TSRM
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "php4dll"=.\php4dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name Zend
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libmysql
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name TSRM
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Zend"=..\Zend\Zend.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name TSRM
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "fastcgi"=..\sapi\fastcgi\fastcgi.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name php5dll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name TSRM
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Zend
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "php5"=.\php5.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name php5dll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Zend
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name TSRM
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "php5dll"=.\php5dll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Zend
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libmysql
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name TSRM
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/win32/php4dll.dsp b/win32/php5dll.dsp
index 882d02a8f7..542ce057f8 100644
--- a/win32/php4dll.dsp
+++ b/win32/php5dll.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4dll" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5dll" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=php4dll - Win32 Debug
+CFG=php5dll - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "php4dll.mak".
+!MESSAGE NMAKE /f "php5dll.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "php4dll.mak" CFG="php4dll - Win32 Debug"
+!MESSAGE NMAKE /f "php5dll.mak" CFG="php5dll - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "php4dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dll - Win32 Release_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dll - Win32 Release_inline" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -43,8 +43,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "..\Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40d /d "_DEBUG"
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib TSRM.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"c:\php-fcgi\php4nts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug" /libpath:"..\Zend\Debug" /libpath:"..\..\bindlib_w32\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib TSRM.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"c:\php-fcgi\php5nts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug" /libpath:"..\Zend\Debug" /libpath:"..\..\bindlib_w32\Debug"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -80,14 +80,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib tsrm.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php4nts.dll" /libpath:"..\Zend\Release" /libpath:"..\TSRM\Release_TS" /libpath:"..\..\bindlib_w32\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib tsrm.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php5nts.dll" /libpath:"..\Zend\Release" /libpath:"..\TSRM\Release_TS" /libpath:"..\..\bindlib_w32\Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4dll___Win32_Release_inline"
-# PROP BASE Intermediate_Dir "php4dll___Win32_Release_inline"
+# PROP BASE Output_Dir "php5dll___Win32_Release_inline"
+# PROP BASE Intermediate_Dir "php5dll___Win32_Release_inline"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
@@ -96,8 +96,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\Release_inline"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -106,16 +106,16 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib tsrm.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php4nts.dll" /libpath:"..\Zend\Release_inline" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php5nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib tsrm.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php5nts.dll" /libpath:"..\Zend\Release_inline" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "php4dll - Win32 Debug"
-# Name "php4dll - Win32 Release"
-# Name "php4dll - Win32 Release_inline"
+# Name "php5dll - Win32 Debug"
+# Name "php5dll - Win32 Release"
+# Name "php5dll - Win32 Release_inline"
 # Begin Group "Core"
 
 # PROP Default_Filter ""
@@ -518,13 +518,13 @@ SOURCE=..\ext\odbc\php_odbc.c
 
 SOURCE=..\ext\pcre\php_pcre.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # ADD CPP /D "STATIC"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 !ENDIF 
 
@@ -774,13 +774,13 @@ SOURCE=..\regex\regfree.c
 
 SOURCE=..\ext\pcre\pcrelib\chartables.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # ADD CPP /D "STATIC"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 !ENDIF 
 
@@ -789,13 +789,13 @@ SOURCE=..\ext\pcre\pcrelib\chartables.c
 
 SOURCE=..\ext\pcre\pcrelib\get.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # ADD CPP /D "STATIC"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 !ENDIF 
 
@@ -804,13 +804,13 @@ SOURCE=..\ext\pcre\pcrelib\get.c
 
 SOURCE=..\ext\pcre\pcrelib\maketables.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # ADD CPP /D "STATIC"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 !ENDIF 
 
@@ -819,13 +819,13 @@ SOURCE=..\ext\pcre\pcrelib\maketables.c
 
 SOURCE=..\ext\pcre\pcrelib\pcre.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # ADD CPP /D "STATIC"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 !ENDIF 
 
@@ -834,13 +834,13 @@ SOURCE=..\ext\pcre\pcrelib\pcre.c
 
 SOURCE=..\ext\pcre\pcrelib\study.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # ADD CPP /D "STATIC"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 !ENDIF 
 
@@ -990,17 +990,17 @@ SOURCE=..\ext\calendar\sdncal.h
 
 SOURCE=..\ext\bcmath\libbcmath\src\add.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1012,17 +1012,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\add.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\compare.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1034,17 +1034,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\compare.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\debug.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1056,17 +1056,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\debug.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\div.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1078,17 +1078,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\div.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1100,17 +1100,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1122,17 +1122,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\init.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1144,17 +1144,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\init.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1166,17 +1166,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1188,17 +1188,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\neg.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1210,17 +1210,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\neg.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1232,17 +1232,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1254,17 +1254,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1276,17 +1276,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\output.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1298,17 +1298,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\output.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\raise.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1320,17 +1320,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\raise.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1342,17 +1342,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1364,17 +1364,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1386,17 +1386,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\rt.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1408,17 +1408,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\rt.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1430,17 +1430,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1452,17 +1452,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\sub.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1474,17 +1474,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\sub.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\zero.c
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1500,11 +1500,11 @@ SOURCE=..\ext\bcmath\libbcmath\src\zero.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 
@@ -1515,11 +1515,11 @@ SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
 
 SOURCE=..\ext\bcmath\libbcmath\src\config.h
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 
@@ -1530,11 +1530,11 @@ SOURCE=..\ext\bcmath\libbcmath\src\config.h
 
 SOURCE=..\ext\bcmath\libbcmath\src\private.h
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # PROP Intermediate_Dir "..\Release_inline_bcmath"
 
@@ -1675,7 +1675,7 @@ SOURCE=..\win32\wfile.h
 
 SOURCE=..\ext\standard\parsedate.y
 
-!IF  "$(CFG)" == "php4dll - Win32 Debug"
+!IF  "$(CFG)" == "php5dll - Win32 Debug"
 
 # Begin Custom Build - Generating ext/standard/parsedate.c
 InputPath=..\ext\standard\parsedate.y
@@ -1686,7 +1686,7 @@ InputPath=..\ext\standard\parsedate.y
 	
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"
 
 # Begin Custom Build - Generating ext/standard/parsedate.c
 InputPath=..\ext\standard\parsedate.y
@@ -1697,7 +1697,7 @@ InputPath=..\ext\standard\parsedate.y
 	
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"
 
 # Begin Custom Build - Generating ext/standard/parsedate.c
 InputPath=..\ext\standard\parsedate.y
diff --git a/win32/php4dllts.dsp b/win32/php5dllts.dsp
index 48b9abd640..68d66a7b17 100644
--- a/win32/php4dllts.dsp
+++ b/win32/php5dllts.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php4dllts" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5dllts" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=php4dllts - Win32 Debug_TS
+CFG=php5dllts - Win32 Debug_TS
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "php4dllts.mak".
+!MESSAGE NMAKE /f "php5dllts.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "php4dllts.mak" CFG="php4dllts - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5dllts.mak" CFG="php5dllts - Win32 Debug_TS"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "php4dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dllts - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dllts - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -31,7 +31,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -44,8 +44,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Debug_TS"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40d /d "_DEBUG"
@@ -55,9 +55,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"msvcrt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" /libpath:"..\ext\sqlite\Debug_TS" /libpath:"..\..\libiconv\lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"msvcrt" /out:"..\Debug_TS\php5ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" /libpath:"..\ext\sqlite\Debug_TS" /libpath:"..\..\libiconv\lib"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release_TS"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_STATIC" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_STATIC" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -81,14 +81,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\ext\sqlite\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php5ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\ext\sqlite\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4dllts___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4dllts___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5dllts___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5dllts___Win32_Release_TS_inline"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release_TS_inline"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -107,15 +107,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"Release_TS_Inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib" /libpath:"..\ext\sqlite\Release_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php5ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS_inline\php5ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"Release_TS_Inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib" /libpath:"..\ext\sqlite\Release_TS"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4dllts___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "php4dllts___Win32_Release_TSDbg"
+# PROP BASE Output_Dir "php5dllts___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "php5dllts___Win32_Release_TSDbg"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
@@ -124,8 +124,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release_TSDbg"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -134,17 +134,17 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"Release_TS"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"Release_TSDbg" /libpath:"..\ext\sqlite\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php5ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"Release_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TSDbg\php5ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"Release_TSDbg" /libpath:"..\ext\sqlite\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "php4dllts - Win32 Debug_TS"
-# Name "php4dllts - Win32 Release_TS"
-# Name "php4dllts - Win32 Release_TS_inline"
-# Name "php4dllts - Win32 Release_TSDbg"
+# Name "php5dllts - Win32 Debug_TS"
+# Name "php5dllts - Win32 Release_TS"
+# Name "php5dllts - Win32 Release_TS_inline"
+# Name "php5dllts - Win32 Release_TSDbg"
 # Begin Group "Core"
 
 # PROP Default_Filter ""
@@ -767,22 +767,22 @@ SOURCE=..\ext\calendar\sdncal.h
 
 SOURCE=..\ext\bcmath\libbcmath\src\add.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -796,22 +796,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\add.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\compare.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -825,22 +825,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\compare.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\debug.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -854,22 +854,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\debug.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\div.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -883,22 +883,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\div.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -912,22 +912,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -941,22 +941,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\init.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -970,22 +970,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\init.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -999,22 +999,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1028,22 +1028,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\neg.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1057,22 +1057,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\neg.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1086,22 +1086,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1115,22 +1115,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1144,22 +1144,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\output.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1173,22 +1173,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\output.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\raise.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1202,22 +1202,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\raise.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1231,22 +1231,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1260,22 +1260,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1289,22 +1289,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\rt.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1318,22 +1318,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\rt.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1347,22 +1347,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1376,22 +1376,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\sub.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1405,22 +1405,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\sub.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\zero.c
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 # ADD CPP /I "..\ext\bcmath\libbcmath\src"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1438,19 +1438,19 @@ SOURCE=..\ext\bcmath\libbcmath\src\zero.c
 
 SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1462,19 +1462,19 @@ SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
 
 SOURCE=..\ext\bcmath\libbcmath\src\config.h
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1486,19 +1486,19 @@ SOURCE=..\ext\bcmath\libbcmath\src\config.h
 
 SOURCE=..\ext\bcmath\libbcmath\src\private.h
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -2151,7 +2151,7 @@ SOURCE=.\winutil.h
 
 SOURCE=..\ext\standard\parsedate.y
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 # Begin Custom Build - Generating ext/standard/parsedate.c
 InputPath=..\ext\standard\parsedate.y
@@ -2162,7 +2162,7 @@ InputPath=..\ext\standard\parsedate.y
 	
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 # Begin Custom Build - Generating ext/standard/parsedate.c
 InputPath=..\ext\standard\parsedate.y
@@ -2173,7 +2173,7 @@ InputPath=..\ext\standard\parsedate.y
 	
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 # Begin Custom Build - Generating ext/standard/parsedate.c
 InputPath=..\ext\standard\parsedate.y
@@ -2184,7 +2184,7 @@ InputPath=..\ext\standard\parsedate.y
 	
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 # Begin Custom Build - Generating ext/standard/parsedate.c
 InputPath=..\ext\standard\parsedate.y
@@ -2373,17 +2373,17 @@ SOURCE=..\ext\com_dotnet\com_variant.c
 # End Group
 # Begin Source File
 
-SOURCE=.\php4dllts.rc
+SOURCE=.\php5dllts.rc
 # End Source File
 # Begin Source File
 
-SOURCE=.\php4dllts.rc2
+SOURCE=.\php5dllts.rc2
 # End Source File
 # Begin Source File
 
 SOURCE=.\phpts.def
 
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"
 
 USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"	
 # Begin Custom Build - Generating $(InputPath)
@@ -2394,7 +2394,7 @@ InputPath=.\phpts.def
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"
 
 USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"	
 # Begin Custom Build - Generating $(InputPath)
@@ -2405,7 +2405,7 @@ InputPath=.\phpts.def
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
 
 USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"	
 # Begin Custom Build - Generating $(InputPath)
@@ -2416,7 +2416,7 @@ InputPath=.\phpts.def
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
 
 USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"	
 # Begin Custom Build - Generating $(InputPath)
diff --git a/win32/php4dllts.rc b/win32/php5dllts.rc
index fc46520710..2e01037eee 100644
--- a/win32/php4dllts.rc
+++ b/win32/php5dllts.rc
@@ -70,7 +70,7 @@ END
 
 BEGIN
 
-    "#include ""php4dllts.rc2""\r\n"
+    "#include ""php5dllts.rc2""\r\n"
 
     "\0"
 
@@ -114,7 +114,7 @@ END
 
 //
 
-#include "php4dllts.rc2"
+#include "php5dllts.rc2"
 
 
 
diff --git a/win32/php4dllts.rc2 b/win32/php5dllts.rc2
index e5680f4a0a..7ae69e4a8c 100644
--- a/win32/php4dllts.rc2
+++ b/win32/php5dllts.rc2
@@ -1,5 +1,5 @@
 //
-// php4dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
 //
 
 #ifdef APSTUDIO_INVOKED
@@ -42,7 +42,7 @@ BEGIN
             VALUE "InternalName", "php\0"
             VALUE "LegalCopyright", "Copyright � 1997-2004 The PHP Group\0"
             VALUE "LegalTrademarks", "php\0"
-            VALUE "OriginalFilename", "php4ts.dll\0"
+            VALUE "OriginalFilename", "php5ts.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "PHP Thread Safe\0"
             VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
diff --git a/win32/php4ts.dsp b/win32/php5ts.dsp
index c69a20c911..3922904e6d 100644
--- a/win32/php4ts.dsp
+++ b/win32/php5ts.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php4ts" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5ts" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=php4ts - Win32 Debug_TS
+CFG=php5ts - Win32 Debug_TS
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "php4ts.mak".
+!MESSAGE NMAKE /f "php5ts.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "php4ts.mak" CFG="php4ts - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5ts.mak" CFG="php5ts - Win32 Debug_TS"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "php4ts - Win32 Release_TS" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts - Win32 Debug_TS" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts - Win32 Release_TS" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts - Win32 Debug_TS" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CFG=php4ts - Win32 Debug_TS
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "php4ts - Win32 Release_TS"
+!IF  "$(CFG)" == "php5ts - Win32 Release_TS"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -53,9 +53,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 php4ts.lib winmm.lib ws2_32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib ws2_32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
 
-!ELSEIF  "$(CFG)" == "php4ts - Win32 Debug_TS"
+!ELSEIF  "$(CFG)" == "php5ts - Win32 Debug_TS"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -78,15 +78,15 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib netapi32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS/php.exe" /pdbtype:sept /libpath:"..\Debug_TS"
+# ADD LINK32 winmm.lib netapi32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS/php.exe" /pdbtype:sept /libpath:"..\Debug_TS"
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "php4ts - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5ts - Win32 Release_TS_inline"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4ts___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5ts___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TS_inline"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
@@ -105,15 +105,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"
-# ADD LINK32 php4ts.lib winmm.lib ws2_32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\php.exe" /libpath:"..\Release_TS_inline"
+# ADD BASE LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib ws2_32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\php.exe" /libpath:"..\Release_TS_inline"
 
-!ELSEIF  "$(CFG)" == "php4ts - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5ts - Win32 Release_TSDbg"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4ts___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TSDbg"
+# PROP BASE Output_Dir "php5ts___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TSDbg"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
@@ -132,17 +132,17 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TSDbg\php.exe" /libpath:"..\Release_TSDbg"
+# ADD BASE LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TSDbg\php.exe" /libpath:"..\Release_TSDbg"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "php4ts - Win32 Release_TS"
-# Name "php4ts - Win32 Debug_TS"
-# Name "php4ts - Win32 Release_TS_inline"
-# Name "php4ts - Win32 Release_TSDbg"
+# Name "php5ts - Win32 Release_TS"
+# Name "php5ts - Win32 Debug_TS"
+# Name "php5ts - Win32 Release_TS_inline"
+# Name "php5ts - Win32 Release_TSDbg"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ".c"
@@ -177,11 +177,11 @@ SOURCE=..\sapi\cgi\libfcgi\os_win32.c
 # End Group
 # Begin Source File
 
-SOURCE=.\php4ts.rc
+SOURCE=.\php5ts.rc
 # End Source File
 # Begin Source File
 
-SOURCE=.\php4ts.rc2
+SOURCE=.\php5ts.rc2
 # End Source File
 # End Target
 # End Project
diff --git a/win32/php5ts.dsw b/win32/php5ts.dsw
index 0e72c34925..029923a11e 100644
--- a/win32/php5ts.dsw
+++ b/win32/php5ts.dsw
@@ -57,7 +57,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "php4activescript"=..\SAPI\activescript\php4activescript.dsp - Package Owner=<4>
+Project: "php5activescript"=..\SAPI\activescript\php5activescript.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -66,13 +66,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4dllts
+    Project_Dep_Name php5dllts
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "php4aolserver"=..\sapi\aolserver\php4aolserver.dsp - Package Owner=<4>
+Project: "php5aolserver"=..\sapi\aolserver\php5aolserver.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -81,13 +81,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4dllts
+    Project_Dep_Name php5dllts
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "php4apache"=..\sapi\apache\php4apache.dsp - Package Owner=<4>
+Project: "php5apache"=..\sapi\apache\php5apache.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -96,13 +96,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4dllts
+    Project_Dep_Name php5dllts
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "php4apache2"=..\SAPI\APACHE2HANDLER\php4apache2.dsp - Package Owner=<4>
+Project: "php5apache2"=..\SAPI\APACHE2HANDLER\php5apache2.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -111,13 +111,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4dllts
+    Project_Dep_Name php5dllts
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "php4dllts"=.\php4dllts.dsp - Package Owner=<4>
+Project: "php5dllts"=.\php5dllts.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -138,7 +138,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "php4isapi"=..\sapi\isapi\php4isapi.dsp - Package Owner=<4>
+Project: "php5isapi"=..\sapi\isapi\php5isapi.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -147,13 +147,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4dllts
+    Project_Dep_Name php5dllts
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "php4nsapi"=..\sapi\nsapi\php4nsapi.dsp - Package Owner=<4>
+Project: "php5nsapi"=..\sapi\nsapi\php5nsapi.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -162,13 +162,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4dllts
+    Project_Dep_Name php5dllts
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "php4pi3web"=..\sapi\pi3web\php4pi3web.dsp - Package Owner=<4>
+Project: "php5pi3web"=..\sapi\pi3web\php5pi3web.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -177,13 +177,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4dllts
+    Project_Dep_Name php5dllts
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "php4ts"=.\php4ts.dsp - Package Owner=<4>
+Project: "php5ts"=.\php5ts.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -192,13 +192,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4dllts
+    Project_Dep_Name php5dllts
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "php4ts_cli"=.\php4ts_cli.dsp - Package Owner=<4>
+Project: "php5ts_cli"=.\php5ts_cli.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -207,7 +207,7 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4dllts
+    Project_Dep_Name php5dllts
     End Project Dependency
 }}}
 
@@ -222,7 +222,7 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php4ts
+    Project_Dep_Name php5ts
     End Project Dependency
 }}}
 
diff --git a/win32/php4ts.rc b/win32/php5ts.rc
index eee4ef41af..d9a4aa541b 100644
--- a/win32/php4ts.rc
+++ b/win32/php5ts.rc
@@ -70,7 +70,7 @@ END
 
 BEGIN
 
-    "#include ""php4ts.rc2""\r\n"
+    "#include ""php5ts.rc2""\r\n"
 
     "\0"
 
@@ -114,7 +114,7 @@ END
 
 //
 
-#include "php4ts.rc2"
+#include "php5ts.rc2"
 
 
 
diff --git a/win32/php4ts.rc2 b/win32/php5ts.rc2
index 571d855855..a708ac5ea5 100644
--- a/win32/php4ts.rc2
+++ b/win32/php5ts.rc2
@@ -1,5 +1,5 @@
 //
-// php4dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
 //
 
 #ifdef APSTUDIO_INVOKED
diff --git a/win32/php4ts_cli.dsp b/win32/php5ts_cli.dsp
index 9c086fa64c..37a4113ad4 100644
--- a/win32/php4ts_cli.dsp
+++ b/win32/php5ts_cli.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php4ts_cli" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5ts_cli" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=php4ts_cli - Win32 Debug_TS
+CFG=php5ts_cli - Win32 Debug_TS
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "php4ts_cli.mak".
+!MESSAGE NMAKE /f "php5ts_cli.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "php4ts_cli.mak" CFG="php4ts_cli - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5ts_cli.mak" CFG="php5ts_cli - Win32 Debug_TS"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "php4ts_cli - Win32 Release_TS" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts_cli - Win32 Debug_TS" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts_cli - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts_cli - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts_cli - Win32 Release_TS" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts_cli - Win32 Debug_TS" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts_cli - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts_cli - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CFG=php4ts_cli - Win32 Debug_TS
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "php4ts_cli - Win32 Release_TS"
+!IF  "$(CFG)" == "php5ts_cli - Win32 Release_TS"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -53,9 +53,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\cli\php.exe" /libpath:"..\Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\cli\php.exe" /libpath:"..\Release_TS"
 
-!ELSEIF  "$(CFG)" == "php4ts_cli - Win32 Debug_TS"
+!ELSEIF  "$(CFG)" == "php5ts_cli - Win32 Debug_TS"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -78,15 +78,15 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib netapi32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS\cli\php.exe" /pdbtype:sept /libpath:"..\Debug_TS"
+# ADD LINK32 winmm.lib netapi32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS\cli\php.exe" /pdbtype:sept /libpath:"..\Debug_TS"
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "php4ts_cli - Win32 Release_TS_inline"
+!ELSEIF  "$(CFG)" == "php5ts_cli - Win32 Release_TS_inline"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4ts___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5ts___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TS_inline"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
@@ -105,15 +105,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\cli\php.exe" /libpath:"..\Release_TS_inline"
+# ADD BASE LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\cli\php.exe" /libpath:"..\Release_TS_inline"
 
-!ELSEIF  "$(CFG)" == "php4ts_cli - Win32 Release_TSDbg"
+!ELSEIF  "$(CFG)" == "php5ts_cli - Win32 Release_TSDbg"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4ts___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TSDbg"
+# PROP BASE Output_Dir "php5ts___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TSDbg"
 # PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
@@ -132,17 +132,17 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TSDbg\php.exe" /libpath:"..\Release_TSDbg"
+# ADD BASE LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TSDbg\php.exe" /libpath:"..\Release_TSDbg"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "php4ts_cli - Win32 Release_TS"
-# Name "php4ts_cli - Win32 Debug_TS"
-# Name "php4ts_cli - Win32 Release_TS_inline"
-# Name "php4ts_cli - Win32 Release_TSDbg"
+# Name "php5ts_cli - Win32 Release_TS"
+# Name "php5ts_cli - Win32 Debug_TS"
+# Name "php5ts_cli - Win32 Release_TS_inline"
+# Name "php5ts_cli - Win32 Release_TSDbg"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ".c"
@@ -165,11 +165,11 @@ SOURCE=..\sapi\cli\php_getopt.h
 # End Group
 # Begin Source File
 
-SOURCE=.\php4ts_cli.rc
+SOURCE=.\php5ts_cli.rc
 # End Source File
 # Begin Source File
 
-SOURCE=.\php4ts_cli.rc2
+SOURCE=.\php5ts_cli.rc2
 # End Source File
 # End Target
 # End Project
diff --git a/win32/php4ts_cli.rc b/win32/php5ts_cli.rc
index cc9af4fdc1..0053e0c7f2 100644
--- a/win32/php4ts_cli.rc
+++ b/win32/php5ts_cli.rc
@@ -70,7 +70,7 @@ END
 
 BEGIN
 
-    "#include ""php4ts_cli.rc2""\r\n"
+    "#include ""php5ts_cli.rc2""\r\n"
 
     "\0"
 
@@ -114,7 +114,7 @@ END
 
 //
 
-#include "php4ts_cli.rc2"
+#include "php5ts_cli.rc2"
 
 
 
diff --git a/win32/php4ts_cli.rc2 b/win32/php5ts_cli.rc2
index d9ec863132..21517ca0ba 100644
--- a/win32/php4ts_cli.rc2
+++ b/win32/php5ts_cli.rc2
@@ -1,5 +1,5 @@
 //
-// php4dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
 //
 
 #ifdef APSTUDIO_INVOKED
diff --git a/win32/pws-php4cgi.reg b/win32/pws-php5cgi.reg
index 46edc77386..46edc77386 100644
--- a/win32/pws-php4cgi.reg
+++ b/win32/pws-php5cgi.reg
diff --git a/win32/pws-php4isapi.reg b/win32/pws-php5isapi.reg
index 47804a946a..393604d28d 100644
--- a/win32/pws-php4isapi.reg
+++ b/win32/pws-php5isapi.reg
@@ -1,5 +1,5 @@
 REGEDIT4
 
 [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\w3svc\parameters\Script Map]
-".php"="[PUT PATH HERE]\\php4isapi.dll"
+".php"="[PUT PATH HERE]\\php5isapi.dll"
 
diff --git a/win32/resource.h b/win32/resource.h
index 5a1669bddd..3e7e4c0ed1 100644
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
-// Used by php4dllts.rc
+// Used by php5dllts.rc
 //
 
 // Next default values for new objects
diff --git a/win32/signal.h b/win32/signal.h
index a95b15c102..de43f98e80 100644
--- a/win32/signal.h
+++ b/win32/signal.h
@@ -3,7 +3,7 @@
 ** the original "#include <signal.h>" produces an infinite reinclusion
 ** of this file, instead of including the standard include-file.
 ** Under MS Visual Studio, there are occurences in the source where
-** <signal.h> gets included throughout the PHP4 sources, and this should
+** <signal.h> gets included throughout the PHP sources, and this should
 ** include THIS file, not the standard one which does not have the
 ** additional signals defined below.
 ** One way to remove the infinite reinclusion of this file (which is located
author	foobar <sniper@php.net>	2004-01-17 13:00:38 +0000
committer	foobar <sniper@php.net>	2004-01-17 13:00:38 +0000
commit	f4983c0d3f56c2074458e4840db36643b2fec59b (patch)
tree	2dcf521f07114e3bb2952439fe28cdfa40d30677 /win32
parent	b851f3712388de9f6c4addf2063dbc3c663a0b3b (diff)
download	php-git-f4983c0d3f56c2074458e4840db36643b2fec59b.tar.gz