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/lib/apr aprlib.def aprlib.dsp aprlibdll.dsp
Date Thu, 09 Nov 2000 17:59:18 GMT
wrowe       00/11/09 09:59:18

  Modified:    src/lib/apr/network_io/win32 sockaddr.c
               src/lib/apr aprlib.def aprlib.dsp aprlibdll.dsp
  Log:
    Fast fix to get Win32 APR building (on to Apache itself)
  
  Revision  Changes    Path
  1.17      +1 -1      apache-2.0/src/lib/apr/network_io/win32/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockaddr.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- sockaddr.c	2000/11/09 15:01:26	1.16
  +++ sockaddr.c	2000/11/09 17:59:16	1.17
  @@ -78,7 +78,7 @@
   apr_status_t apr_set_ipaddr(apr_socket_t *sock, apr_interface_e which, const char *addr)
   {
       u_long ipaddr;
  -    sockaddr_in *ptr;
  +    struct sockaddr_in *ptr;
   
       if (which == APR_LOCAL)
           ptr = sock->local_addr;
  
  
  
  1.39      +4 -4      apache-2.0/src/lib/apr/aprlib.def
  
  Index: aprlib.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- aprlib.def	2000/11/08 22:22:48	1.38
  +++ aprlib.def	2000/11/09 17:59:17	1.39
  @@ -214,10 +214,10 @@
   	apr_filename_of_pathname @205
   	apr_get_remote_name @206
   	apr_get_local_name @207
  -	apr_get_local_ipaddr @208
  -	apr_set_local_ipaddr @209
  -	apr_get_remote_ipaddr @210
  -	apr_set_remote_ipaddr @211
  +	apr_get_ipaddr @208
  +	apr_set_ipaddr @209
  +	
  +	
   	apr_get_port @212
   	apr_set_port @213
   	
  
  
  
  1.45      +7 -2      apache-2.0/src/lib/apr/aprlib.dsp
  
  Index: aprlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- aprlib.dsp	2000/10/25 09:03:48	1.44
  +++ aprlib.dsp	2000/11/09 17:59:17	1.45
  @@ -43,7 +43,7 @@
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32"
/I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32"
/I "i18n/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD
/c
   # SUBTRACT CPP /YX
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
  @@ -69,7 +69,7 @@
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   # ADD BASE CPP /nologo /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /ZI
/c
  -# ADD CPP /nologo /MDd /W3 /GX /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32"
/I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32"
/I "i18n/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD /ZI /c
  +# ADD CPP /nologo /MDd /W3 /GX /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD
/ZI /c
   # SUBTRACT CPP /YX
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
  @@ -202,6 +202,11 @@
   # Begin Group "file_io"
   
   # PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\file_io\win32\canonfile.c
  +# PROP Exclude_From_Build 1
  +# End Source File
   # Begin Source File
   
   SOURCE=.\file_io\win32\dir.c
  
  
  
  1.13      +3 -3      apache-2.0/src/lib/apr/aprlibdll.dsp
  
  Index: aprlibdll.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlibdll.dsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- aprlibdll.dsp	2000/10/11 17:19:31	1.12
  +++ aprlibdll.dsp	2000/11/09 17:59:17	1.13
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32"
/I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "NDEBUG" /D
"APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD
/c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  @@ -69,8 +69,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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
/FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32"
/I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32"
/D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD BASE CPP /nologo /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /ZI
/c
  +# ADD CPP /nologo /MDd /W3 /GX /Od /I "./include" /I "./include/arch" /I "./include/arch/win32"
/I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD
/ZI /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  
  
  

Mime
View raw message