httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/os/win32 BaseAddr.ref
Date Tue, 03 Oct 2000 06:55:08 GMT
wrowe       00/10/02 23:55:07

  Modified:    src/lib/expat-lite xmlparse.dsp xmltok.dsp
               src/os/win32 BaseAddr.ref
  Log:
    Fix a few colliding modules
  
  Revision  Changes    Path
  1.3       +5 -2      apache-2.0/src/lib/expat-lite/xmlparse.dsp
  
  Index: xmlparse.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/expat-lite/xmlparse.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xmlparse.dsp	2000/09/20 04:54:05	1.2
  +++ xmlparse.dsp	2000/10/03 06:55:02	1.3
  @@ -53,7 +53,8 @@
   # 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 @@
   # 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 @@
   # Begin Source File
   
   SOURCE="..\..\lib\expat-lite\xmlparse.def"
  +# PROP Exclude_From_Build 1
   # End Source File
   # Begin Source File
   
  
  
  
  1.3       +5 -2      apache-2.0/src/lib/expat-lite/xmltok.dsp
  
  Index: xmltok.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/expat-lite/xmltok.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xmltok.dsp	2000/09/20 04:54:05	1.2
  +++ xmltok.dsp	2000/10/03 06:55:02	1.3
  @@ -53,7 +53,8 @@
   # 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 @@
   # 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 @@
   # Begin Source File
   
   SOURCE="..\..\lib\expat-lite\xmltok.def"
  +# PROP Exclude_From_Build 1
   # End Source File
   # End Target
   # End Project
  
  
  
  1.7       +3 -0      apache-2.0/src/os/win32/BaseAddr.ref
  
  Index: BaseAddr.ref
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/BaseAddr.ref,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BaseAddr.ref	2000/09/20 04:54:04	1.6
  +++ BaseAddr.ref	2000/10/03 06:55:06	1.7
  @@ -23,3 +23,6 @@
   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
  
  
  

Mime
View raw message