Fix a few colliding modules

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

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index b2441525f8bbd5511a694af7894abdf869861e08..5e06d0bf928cd7996416b53740df76126b667299 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -23,3 +23,6 @@ mod_usertrack        0x6FE40000    0x00010000
 mod_proxy            0x6FE20000    0x00020000
 mod_file_cache       0x6FE00000    0x00020000
 mod_auth_dbm         0x6FDF0000    0x00010000
+mod_dav              0x6FDC0000    0x00030000
+xmltok               0x6FDA0000    0x00020000
+xmlparse             0x6FD90000    0x00010000
\ No newline at end of file

diff --git a/srclib/expat-lite/xmlparse.dsp b/srclib/expat-lite/xmlparse.dsp
index 454df6d16463ba9cfdbaea215dc474dd8795bc52..7657e25aefbedc06979fd50677c24d50a67f58a3 100644 (file)
--- a/srclib/expat-lite/xmlparse.dsp
+++ b/srclib/expat-lite/xmlparse.dsp
@@ -53,7 +53,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 /dll /machine:I386
-# ADD 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 winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\xmlparse.def" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse
+# SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "xmlparse - Win32 Debug"
 
@@ -79,7 +80,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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD 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 winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\xmlparse.def" /pdbtype:sept /base:@"..\..\os\win32\BaseAddr.ref",xmlparse
+# SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
 
@@ -98,6 +100,7 @@ SOURCE="..\..\lib\expat-lite\xmlparse.c"
 # Begin Source File
 
 SOURCE="..\..\lib\expat-lite\xmlparse.def"
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 

diff --git a/srclib/expat-lite/xmltok.dsp b/srclib/expat-lite/xmltok.dsp
index ad9c0f42b9d5c78defa212a700544714e4269350..95d46d8f1d32f579914f93058ddd1ae5461636c3 100644 (file)
--- a/srclib/expat-lite/xmltok.dsp
+++ b/srclib/expat-lite/xmltok.dsp
@@ -53,7 +53,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 /dll /machine:I386
-# ADD 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 winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\xmltok.def" /base:@"..\..\os\win32\BaseAddr.ref",xmltok
+# SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "xmltok - Win32 Debug"
 
@@ -80,7 +81,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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD 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 winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\xmltok.def" /pdbtype:sept /base:@"..\..\os\win32\BaseAddr.ref",xmltok
+# SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
 
@@ -103,6 +105,7 @@ SOURCE="..\..\lib\expat-lite\xmltok.c"
 # Begin Source File
 
 SOURCE="..\..\lib\expat-lite\xmltok.def"
+# PROP Exclude_From_Build 1
 # End Source File
 # End Target
 # End Project