Commit 6670e254 authored by Bill Stoddard's avatar Bill Stoddard
Browse files

Add ApacheModAuthDigest to apache.dsw. Get rid of compile warnings. 

Submitted by:	William Rowe
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85014 13f79535-47bb-0310-9956-ffa450edef68
parent b9070f2e

Apache.dsw

+18 −0
Original line number Diff line number Diff line
@@ -66,6 +66,18 @@ Package=<4> 


###############################################################################



Project: "ApacheModuleAuthDigest"=".\os\win32\ApacheModuleAuthDigest.dsp" - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

}}}



###############################################################################



Project: "ApacheModuleCERNMeta"=".\os\win32\ApacheModuleCERNMeta.dsp" - Package Owner=<4>



Package=<5>
@@ -275,6 +287,9 @@ Package=<4> 
    Begin Project Dependency

    Project_Dep_Name rotatelogs

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name ApacheModuleAuthDigest

    End Project Dependency

}}}



###############################################################################
@@ -287,6 +302,9 @@ Package=<5> 


Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name aprlib

    End Project Dependency

}}}



###############################################################################

InstallBin.dsp

+5 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ CFG=InstallBin - Win32 Debug 
# PROP Use_Debug_Libraries 0

# PROP Output_Dir "Release"

# PROP Intermediate_Dir "Release"

# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR=.. SHORT=D LONG=Debug _install"

# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR=.. SHORT=R LONG=Release _install"

# PROP Rebuild_Opt ""

# PROP Target_File "..\Apache.exe"

# PROP Bsc_Name ""
@@ -82,6 +82,10 @@ SOURCE=..\logs\access.log 
# End Source File

# Begin Source File



SOURCE=.\os\win32\BaseAddr.ref

# End Source File

# Begin Source File



SOURCE=..\logs\error.log

# End Source File

# Begin Source File

modules/aaa/mod_auth_digest.dsp

+4 −2
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ 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:windows /dll /machine:I386

# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"

# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_digest

# SUBTRACT LINK32 /pdb:none



!ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
@@ -81,7 +82,8 @@ 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:windows /dll /debug /machine:I386 /pdbtype:sept

# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"

# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_digest

# SUBTRACT LINK32 /pdb:none



!ENDIF

modules/proxy/mod_proxy.dsp

+6 −6
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c

# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c

# ADD BASE MTL /nologo /D "NDEBUG" /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,8 +54,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"

# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"

# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_proxy

# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_proxy



!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
@@ -71,7 +71,7 @@ LINK32=link.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c

# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"

# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"

# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy

# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy



!ENDIF

os/win32/BaseAddr.ref

+10 −10
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 
aprlib               0x6FFA0000    0x00060000

ApacheCore           0x6FF00000    0x000A0000

mod_auth_anon        0x6FEF0000    0x00010000

mod_cern_meta        0x6FEE0000    0x00010000

mod_auth_digest      0x6FED0000    0x00010000

mod_expires          0x6FEC0000    0x00010000

mod_headers          0x6FEB0000    0x00010000

mod_info             0x6FEA0000    0x00010000

mod_rewrite          0x6FE80000    0x00020000

mod_speling          0x6FE70000    0x00010000

mod_status           0x6FE60000    0x00010000

mod_usertrack        0x6FE50000    0x00010000

mod_proxy            0x6FE30000    0x00020000
 
mod_auth_digest      0x6FED0000    0x00020000

mod_cern_meta        0x6FEC0000    0x00010000

mod_expires          0x6FEB0000    0x00010000

mod_headers          0x6FEA0000    0x00010000

mod_info             0x6FE90000    0x00010000

mod_rewrite          0x6FE70000    0x00020000

mod_speling          0x6FE60000    0x00010000

mod_status           0x6FE50000    0x00010000

mod_usertrack        0x6FE40000    0x00010000

mod_proxy            0x6FE20000    0x00020000