You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/12/19 04:14:34 UTC

svn commit: r605401 - in /httpd/httpd/branches/2.0.x/support: ab.dsp abs.dsp htdbm.dsp htdigest.dsp htpasswd.dsp logresolve.dsp rotatelogs.dsp win32/wintty.dsp

Author: wrowe
Date: Tue Dec 18 19:14:32 2007
New Revision: 605401

URL: http://svn.apache.org/viewvc?rev=605401&view=rev
Log:
If compiled for WinNT, CommandLineToArgvW must resolve.

Backports r605397

Modified:
    httpd/httpd/branches/2.0.x/support/ab.dsp
    httpd/httpd/branches/2.0.x/support/abs.dsp
    httpd/httpd/branches/2.0.x/support/htdbm.dsp
    httpd/httpd/branches/2.0.x/support/htdigest.dsp
    httpd/httpd/branches/2.0.x/support/htpasswd.dsp
    httpd/httpd/branches/2.0.x/support/logresolve.dsp
    httpd/httpd/branches/2.0.x/support/rotatelogs.dsp
    httpd/httpd/branches/2.0.x/support/win32/wintty.dsp

Modified: httpd/httpd/branches/2.0.x/support/ab.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/ab.dsp?rev=605401&r1=605400&r2=605401&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/support/ab.dsp (original)
+++ httpd/httpd/branches/2.0.x/support/ab.dsp Tue Dec 18 19:14:32 2007
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /opt:ref
+# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /debug /opt:ref
 
 !ELSEIF  "$(CFG)" == "ab - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
 
 !ENDIF 
 

Modified: httpd/httpd/branches/2.0.x/support/abs.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/abs.dsp?rev=605401&r1=605400&r2=605401&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/support/abs.dsp (original)
+++ httpd/httpd/branches/2.0.x/support/abs.dsp Tue Dec 18 19:14:32 2007
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /libpath:"../srclib/openssl/out32dll"
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /debug /libpath:"../srclib/openssl/out32dll" /opt:ref
+# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib shell32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /libpath:"../srclib/openssl/out32dll"
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /debug /libpath:"../srclib/openssl/out32dll" /opt:ref
 
 !ELSEIF  "$(CFG)" == "abs - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /debug /libpath:"../srclib/openssl/out32dll"
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /debug /libpath:"../srclib/openssl/out32dll"
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /debug /libpath:"../srclib/openssl/out32dll"
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /debug /libpath:"../srclib/openssl/out32dll"
 
 !ENDIF 
 

Modified: httpd/httpd/branches/2.0.x/support/htdbm.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/htdbm.dsp?rev=605401&r1=605400&r2=605401&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/support/htdbm.dsp (original)
+++ httpd/httpd/branches/2.0.x/support/htdbm.dsp Tue Dec 18 19:14:32 2007
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /debug /opt:ref
 
 !ELSEIF  "$(CFG)" == "htdbm - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
 
 !ENDIF 
 

Modified: httpd/httpd/branches/2.0.x/support/htdigest.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/htdigest.dsp?rev=605401&r1=605400&r2=605401&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/support/htdigest.dsp (original)
+++ httpd/httpd/branches/2.0.x/support/htdigest.dsp Tue Dec 18 19:14:32 2007
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /debug /opt:ref
 
 !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
 
 !ENDIF 
 

Modified: httpd/httpd/branches/2.0.x/support/htpasswd.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/htpasswd.dsp?rev=605401&r1=605400&r2=605401&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/support/htpasswd.dsp (original)
+++ httpd/httpd/branches/2.0.x/support/htpasswd.dsp Tue Dec 18 19:14:32 2007
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /debug /opt:ref
 
 !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
 
 !ENDIF 
 

Modified: httpd/httpd/branches/2.0.x/support/logresolve.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/logresolve.dsp?rev=605401&r1=605400&r2=605401&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/support/logresolve.dsp (original)
+++ httpd/httpd/branches/2.0.x/support/logresolve.dsp Tue Dec 18 19:14:32 2007
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /debug /opt:ref
 
 !ELSEIF  "$(CFG)" == "logresolve - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
 
 !ENDIF 
 

Modified: httpd/httpd/branches/2.0.x/support/rotatelogs.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/rotatelogs.dsp?rev=605401&r1=605400&r2=605401&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/support/rotatelogs.dsp (original)
+++ httpd/httpd/branches/2.0.x/support/rotatelogs.dsp Tue Dec 18 19:14:32 2007
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /debug /opt:ref
 
 !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
 
 !ENDIF 
 

Modified: httpd/httpd/branches/2.0.x/support/win32/wintty.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/support/win32/wintty.dsp?rev=605401&r1=605400&r2=605401&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/support/win32/wintty.dsp (original)
+++ httpd/httpd/branches/2.0.x/support/win32/wintty.dsp Tue Dec 18 19:14:32 2007
@@ -49,8 +49,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /opt:ref
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /opt:ref
 
 !ELSEIF  "$(CFG)" == "wintty - Win32 Debug"
 
@@ -73,8 +73,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
 
 !ENDIF