Permalink
Browse files

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

  • Loading branch information...
1 parent b851f37 commit f4983c0d3f56c2074458e4840db36643b2fec59b foobar committed Jan 17, 2004
Showing with 1,134 additions and 1,147 deletions.
  1. +4 −4 ChangeLog
  2. +1 −1 README.PHP4-TO-PHP5-THIN-CHANGES
  3. +1 −1 README.Zeus
  4. +2 −2 Zend/tests/bug26802.phpt
  5. +1 −1 configure.in
  6. +2 −2 ext/bz2/bz2.dsp
  7. +4 −4 ext/com_dotnet/README
  8. +4 −4 ext/cpdf/cpdf.dsp
  9. +2 −2 ext/ctype/ctype.dsp
  10. +8 −8 ext/curl/curl.dsp
  11. +4 −4 ext/dba/dba.dsp
  12. +4 −4 ext/dbase/dbase.dsp
  13. +4 −4 ext/dbx/dbx.dsp
  14. +1 −1 ext/dio/tests/001.phpt
  15. +4 −4 ext/dom/dom.dsp
  16. +4 −4 ext/exif/exif.dsp
  17. +4 −4 ext/fbsql/fbsql.dsp
  18. +4 −4 ext/fdf/fdf.dsp
  19. +4 −4 ext/filepro/filepro.dsp
  20. +4 −4 ext/gd/gd.dsp
  21. +4 −4 ext/gettext/gettext.dsp
  22. +1 −1 ext/gmp/tests/001.phpt
  23. +2 −2 ext/iconv/iconv.dsp
  24. +4 −4 ext/imap/imap.dsp
  25. +2 −2 ext/informix/ifx.dsp
  26. +1 −1 ext/informix/ifx.ec
  27. +2 −2 ext/ingres_ii/README
  28. +2 −2 ext/ingres_ii/ingres.dsp
  29. +4 −4 ext/interbase/interbase.dsp
  30. +1 −1 ext/ldap/LDAP_Win32_HOWTO.txt
  31. +14 −14 ext/ldap/ldap.dsp
  32. +1 −1 ext/ldap/ldap.mak
  33. +1 −1 ext/mbstring/mbstring.c
  34. +4 −4 ext/mbstring/mbstring.dsp
  35. +1 −1 ext/mbstring/mbstring.h
  36. +4 −4 ext/mcrypt/mcrypt.dsp
  37. +1 −1 ext/mcve/config.m4
  38. +2 −2 ext/mcve/mcve.dsp
  39. +1 −1 ext/mcve/tests/001.phpt
  40. +4 −4 ext/mhash/mhash.dsp
  41. +2 −2 ext/mime_magic/mime_magic.dsp
  42. +2 −2 ext/ming/ming.dsp
  43. +1 −1 ext/mnogosearch/README
  44. +1 −1 ext/mnogosearch/index.php
  45. +2 −2 ext/msql/msql.dsp
  46. +4 −4 ext/mssql/mssql.dsp
  47. +1 −1 ext/mssql/mssql_win32_howto.txt
  48. +1 −1 ext/mssql/php_mssql.c
  49. +4 −4 ext/mysql/mysql.dsp
  50. +2 −2 ext/mysqli/mysqli.dsp
  51. +1 −1 ext/ncurses/tests/001.phpt
  52. +4 −4 ext/oci8/oci8.dsp
  53. +2 −2 ext/odbc/config.m4
  54. +2 −1 ext/openssl/README
  55. +2 −2 ext/openssl/openssl.dsp
  56. +4 −4 ext/oracle/oracle.dsp
  57. +4 −4 ext/pdf/pdf.dsp
  58. +3 −3 ext/pgsql/pgsql.dsp
  59. +2 −2 ext/pspell/README
  60. +3 −3 ext/pspell/pspell.dsp
  61. +1 −1 ext/shmop/README
  62. +2 −2 ext/shmop/shmop.dsp
  63. +2 −2 ext/simplexml/simplexml.dsp
  64. +4 −4 ext/skeleton/skeleton.dsp
  65. +1 −1 ext/skeleton/tests/001.phpt
  66. +4 −4 ext/snmp/snmp.dsp
  67. +2 −2 ext/sockets/sockets.dsp
  68. +2 −2 ext/sqlite/sqlite.dsp
  69. +6 −5 ext/standard/credits_ext.h
  70. +3 −3 ext/standard/credits_sapi.h
  71. +1 −1 ext/sybase/php_sybase_db.c
  72. +1 −1 ext/sybase_ct/php_sybase_ct.c
  73. +4 −4 ext/sybase_ct/sybase_ct.dsp
  74. +2 −2 ext/tidy/tidy.dsp
  75. +2 −2 ext/tokenizer/tokenizer.dsp
  76. +2 −2 ext/w32api/w32api.c
  77. +2 −2 ext/w32api/w32api.dsp
  78. +1 −1 ext/xml/xml.mak
  79. +2 −2 ext/xmlrpc/xmlrpc.dsp
  80. +2 −2 ext/xsl/xsl.dsp
  81. +2 −2 ext/yaz/yaz.dsp
  82. +4 −4 ext/zlib/zlib.dsp
  83. +1 −1 ext/zlib/zlib_win32_howto.txt
  84. +2 −2 netware/buildsapi.bat
  85. +3 −3 netware/{php4apache.mak → php5apache.mak}
  86. +2 −2 netware/{php4apache2filter.mak → php5apache2filter.mak}
  87. +1 −1 netware/{php4cli.mak → php5cli.mak}
  88. +2 −2 netware/phplib.mak
  89. +3 −3 php4.spec.in → php5.spec.in
  90. +1 −1 sapi/activescript/README
  91. +2 −2 sapi/activescript/classfactory.cpp
  92. +2 −2 sapi/activescript/config.w32
  93. +1 −1 sapi/activescript/{php4activescript.c → php5activescript.c}
  94. 0 sapi/activescript/{php4activescript.def → php5activescript.def}
  95. +39 −39 sapi/activescript/{php4activescript.dsp → php5activescript.dsp}
  96. 0 sapi/activescript/{php4activescript.h → php5activescript.h}
  97. 0 sapi/activescript/{php4as_classfactory.h → php5as_classfactory.h}
  98. 0 sapi/activescript/{php4as_scriptengine.h → php5as_scriptengine.h}
  99. +3 −3 sapi/activescript/scriptengine.cpp
  100. +1 −1 sapi/aolserver/README
  101. +21 −21 sapi/aolserver/{php4aolserver.dsp → php5aolserver.dsp}
  102. +1 −1 sapi/apache/config.w32
  103. +22 −22 sapi/apache/{php4apache.dsp → php5apache.dsp}
  104. +16 −16 sapi/apache2handler/{php4apache2.dsp → php5apache2.dsp}
  105. +12 −12 sapi/apache_hooks/apMakefile.tmpl
  106. +21 −21 sapi/apache_hooks/config.m4
  107. +2 −2 sapi/apache_hooks/config.w32
  108. +1 −1 sapi/apache_hooks/{libphp4.module.in → libphp5.module.in}
  109. +0 −1 sapi/apache_hooks/mod_php4.exp
  110. +18 −18 sapi/apache_hooks/{mod_php4.c → mod_php5.c}
  111. +1 −0 sapi/apache_hooks/mod_php5.exp
  112. +3 −3 sapi/apache_hooks/{mod_php4.h → mod_php5.h}
  113. +1 −1 sapi/apache_hooks/php.sym
  114. +24 −24 sapi/apache_hooks/{php4apache_hooks.dsp → php5apache_hooks.dsp}
  115. +1 −1 sapi/apache_hooks/php_apache_http.h
  116. +5 −5 sapi/caudium/caudium.c
  117. +2 −2 sapi/caudium/config.m4
  118. +1 −1 sapi/cgi/README.FastCGI
  119. +1 −1 sapi/continuity/capi.c
  120. +12 −12 sapi/embed/{php4embed.dsp → php5embed.dsp}
  121. +1 −1 sapi/isapi/config.m4
  122. +2 −2 sapi/isapi/config.w32
  123. 0 sapi/isapi/{php4isapi.c → php5isapi.c}
  124. 0 sapi/isapi/{php4isapi.def → php5isapi.def}
  125. +36 −36 sapi/isapi/{php4isapi.dsp → php5isapi.dsp}
  126. +1 −1 sapi/isapi/stresstest/notes.txt
  127. +1 −1 sapi/isapi/stresstest/stresstest.cpp
  128. +28 −28 sapi/nsapi/{php4nsapi.dsp → php5nsapi.dsp}
  129. +13 −13 sapi/pi3web/README
  130. +1 −1 sapi/pi3web/config.m4
  131. +1 −1 sapi/pi3web/config.w32
  132. +25 −25 sapi/pi3web/{php4pi3web.dsp → php5pi3web.dsp}
  133. +3 −3 sapi/pi3web/pi3web_sapi.c
  134. +4 −4 sapi/pi3web/pi3web_sapi.h
  135. +2 −2 sapi/roxen/README
  136. +6 −6 sapi/roxen/TODO
  137. +1 −1 sapi/roxen/config.m4
  138. +4 −4 sapi/roxen/roxen.c
  139. +2 −2 sapi/thttpd/config.m4
  140. +1 −1 sapi/thttpd/thttpd_patch
  141. +8 −8 sapi/tux/README
  142. +1 −1 sapi/tux/config.m4
  143. +1 −1 sapi/webjames/README
  144. +3 −3 scripts/dev/credits
  145. +4 −4 tests/classes/inheritance_002.phpt
  146. +0 −15 tests/test.php4
  147. +1 −1 win32/build/config.w32
  148. +42 −42 win32/install.txt
  149. +1 −1 win32/installer/README
  150. +5 −5 win32/installer/gen-nsis.php
  151. +19 −19 win32/{php4.dsp → php5.dsp}
  152. +107 −107 win32/{php4.dsw → php5.dsw}
  153. +124 −124 win32/{php4dll.dsp → php5dll.dsp}
  154. +148 −148 win32/{php4dllts.dsp → php5dllts.dsp}
  155. +2 −2 win32/{php4dllts.rc → php5dllts.rc}
  156. +2 −2 win32/{php4dllts.rc2 → php5dllts.rc2}
  157. +28 −28 win32/{php4ts.dsp → php5ts.dsp}
  158. +20 −20 win32/php5ts.dsw
  159. +2 −2 win32/{php4ts.rc → php5ts.rc}
  160. +1 −1 win32/{php4ts.rc2 → php5ts.rc2}
  161. +28 −28 win32/{php4ts_cli.dsp → php5ts_cli.dsp}
  162. +2 −2 win32/{php4ts_cli.rc → php5ts_cli.rc}
  163. +1 −1 win32/{php4ts_cli.rc2 → php5ts_cli.rc2}
  164. 0 win32/{pws-php4cgi.reg → pws-php5cgi.reg}
  165. +1 −1 win32/{pws-php4isapi.reg → pws-php5isapi.reg}
  166. +1 −1 win32/resource.h
  167. +1 −1 win32/signal.h
View
@@ -1085,9 +1085,9 @@
win32/crypt_win32.h
win32/grp.h
win32/md5crypt.h
- win32/php4dllts.rc2
- win32/php4ts.rc2
- win32/php4ts_cli.rc2
+ win32/php5dllts.rc2
+ win32/php5ts.rc2
+ win32/php5ts_cli.rc2
win32/pwd.h
win32/select.h
win32/syslog.h
@@ -1502,7 +1502,7 @@
2004-01-08 Frank M. Kromann <frank@kromann.info>
- * win32/php4dllts.dsp:
+ * win32/php5dllts.dsp:
Adding new com_dotnet source files to project
2004-01-07 Jani Taskinen <jani.taskinen@kolumbus.fi>
@@ -34,7 +34,7 @@
- mysqli_fetch_assoc()
5. PATH_TRANSLATED server variable is no longer set implicitly under
- Apache2 SAPI in contrast to the situation in PHP4, where it is set to the
+ Apache2 SAPI in contrast to the situation in PHP 4, where it is set to the
same value as the SCRIPT_FILENAME server variable when it is not populated
by Apache. This change was made to comply with the CGI specification.
Please refer to bug #23610 for further information.
View
@@ -1,4 +1,4 @@
-Using PHP4 with the Zeus Web Server
+Using PHP5 with the Zeus Web Server
-----------------------------------
Zeus fully supports running PHP in combination with our
View
@@ -33,8 +33,8 @@ $static_method = "foo::bar";
$static_method();
-/* The following is a BC break with PHP4 where it would
- * call foo::fail. In PHP5 we first evaluate static class
+/* The following is a BC break with PHP 4 where it would
+ * call foo::fail. In PHP 5 we first evaluate static class
* properties and then do the function call.
*/
$method = 'fail';
View
@@ -1226,7 +1226,7 @@ AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
$php_shtool mkdir -p pear/scripts
$php_shtool mkdir -p scripts
-ALL_OUTPUT_FILES="php4.spec main/build-defs.h \
+ALL_OUTPUT_FILES="php5.spec main/build-defs.h \
scripts/phpize scripts/php-config \
$PHP_OUTPUT_FILES"
View
@@ -54,7 +54,7 @@ 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 libbz2.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.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_bz2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 libbz2.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.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_bz2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
!ELSEIF "$(CFG)" == "bz2 - Win32 Debug_TS"
@@ -80,7 +80,7 @@ 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 php4ts_debug.lib libbz2.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 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_bz2.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts_debug.lib libbz2.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 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_bz2.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
!ENDIF
View
@@ -1,6 +1,6 @@
This is the new php5 COM module.
-It is not 100% backwards compatible with php4 ext/com, but you should not miss
+It is not 100% backwards compatible with PHP 4 ext/com, but you should not miss
the "features" that have not been retained.
This module exposes 3 classes: variant, com and dotnet(*).
@@ -26,15 +26,15 @@ $obj = new COM("...");
$obj[1]->foo();
The code above will use the type information for the object to determine its
-default property and then access it. In php4, it was hard-coded to use the
+default property and then access it. In PHP 4, it was hard-coded to use the
"Items" member, which was wrong.
The default property will also be used by the casting support to determine the
value for the object.
Variants:
-This implementation of COM takes a simpler approach than the php4 version;
+This implementation of COM takes a simpler approach than the PHP 4 version;
we only map a few native types to COM and vice-versa, leaving the more complex
things as variants. This allows greater consistency of data when passing
parameters to and from COM objects (no data will be lost). In addition, a
@@ -72,7 +72,7 @@ TODO:
actually arrays.
- SafeArray support for variant class.
Currently there is no way to access a safearray from php.
-- A few other com_xxx functions need to be ported from the php4 extension.
+- A few other com_xxx functions need to be ported from the PHP 4 extension.
- documentation
* dotnet support requires that you have the mscoree.h header from the .net sdk
View
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib cpdfi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib cpdf.lib user32.lib winspool.lib kernel32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_cpdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib cpdfi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib cpdf.lib user32.lib winspool.lib kernel32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_cpdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "cpdf - Win32 Debug_TS"
@@ -81,8 +81,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib cpdfi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 cpdf.lib php4ts_debug.lib user32.lib winspool.lib kernel32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_cpdf.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib cpdfi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 cpdf.lib php5ts_debug.lib user32.lib winspool.lib kernel32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_cpdf.dll" /libpath:"..\..\Debug_TS"
# SUBTRACT LINK32 /pdb:none
!ENDIF
View
@@ -53,7 +53,7 @@ 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 php4ts.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 /dll /machine:I386 /out:"..\..\Release_TS/php_ctype.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.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 /dll /machine:I386 /out:"..\..\Release_TS/php_ctype.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "ctype - Win32 Debug_TS"
@@ -79,7 +79,7 @@ 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 php4ts_debug.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 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ctype.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.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 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ctype.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
View
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libcurl.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 wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
+# 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 php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib libcurl.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 wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "curl - Win32 Debug_TS"
@@ -83,8 +83,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib libcurl.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 wsock32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
+# 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 php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib libcurl.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 wsock32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "curl - Win32 Debug_TS_SSL"
@@ -111,9 +111,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts_debug.lib libcurl.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 /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 php5ts_debug.lib libcurl.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 /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts_debug.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.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 wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
+# ADD LINK32 php5ts_debug.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.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 wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
!ELSEIF "$(CFG)" == "curl - Win32 Release_TS_SSL"
@@ -140,9 +140,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib libcurl.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 /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 php5ts.lib libcurl.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 /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.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 wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
+# ADD LINK32 php5ts.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.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 wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
View
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib libdb31s.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 /dll /machine:I386 /out:"..\..\Release_TS/php_dba.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
-# ADD LINK32 php4ts.lib libdb31s.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 /dll /machine:I386 /out:"..\..\Release_TS/php_dba.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 php5ts.lib libdb31s.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 /dll /machine:I386 /out:"..\..\Release_TS/php_dba.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib libdb31s.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 /dll /machine:I386 /out:"..\..\Release_TS/php_dba.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "dba - Win32 Debug_TS Berkeley DB3"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts_debug.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 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_dba.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
-# ADD LINK32 php4ts_debug.lib libdb31s.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 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_dba.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 php5ts_debug.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 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_dba.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib libdb31s.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 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_dba.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
Oops, something went wrong.

0 comments on commit f4983c0

Please sign in to comment.