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/ap ap_buckets_mmap.c
Date Mon, 16 Oct 2000 06:38:43 GMT
wrowe       00/10/15 23:38:43

  Modified:    src      ApacheCore.def ApacheCore.dsp
               src/ap   ap_buckets_mmap.c
  Log:
    Nice to see we build again on Win32
  
  Revision  Changes    Path
  1.33      +1 -1      apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ApacheCore.def	2000/10/11 07:47:06	1.32
  +++ ApacheCore.def	2000/10/16 06:38:41	1.33
  @@ -214,7 +214,7 @@
   	ap_rwrite   @207
   	ap_satisfies   @208
   	ap_scan_script_header_err   @209
  -	ap_scan_script_header_err_buff   @210
  +
   	ap_scan_script_header_err_core   @211
   	ap_scan_script_header_err_strs   @212
   
  
  
  
  1.41      +7 -4      apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- ApacheCore.dsp	2000/10/16 06:04:27	1.40
  +++ ApacheCore.dsp	2000/10/16 06:38:42	1.41
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="ApacheCore" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Static Library" 0x0104
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -67,8 +66,8 @@
   RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32"
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32"
/I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT"
/FD /c
  +# ADD BASE CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32"
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /ZI /c
  +# ADD CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32"
/I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT"
/FD /ZI /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -120,6 +119,10 @@
   # Begin Source File
   
   SOURCE=.\ap\ap_buckets_simple.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\ap\ap_buckets_socket.c
   # End Source File
   # Begin Source File
   
  
  
  
  1.15      +7 -0      apache-2.0/src/ap/ap_buckets_mmap.c
  
  Index: ap_buckets_mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_mmap.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_buckets_mmap.c	2000/10/16 06:04:28	1.14
  +++ ap_buckets_mmap.c	2000/10/16 06:38:42	1.15
  @@ -64,10 +64,17 @@
       apr_status_t ok;
       void *addr;
       
  +#ifdef USE_MMAP_FILES
       ok = apr_mmap_offset(&addr, m->mmap, s->start);
       if (ok != APR_SUCCESS) {
   	return ok;
       }
  +#else
  +    /* XXX: This has to go away - win32 needs the symbol. Not tonight though.
  +     * plus ok creates a great unused symbol compile time warning to remind us
  +     */
  +    return APR_ENOTIMPL;
  +#endif
       *str = addr;
       *length = s->end - s->start;
       return APR_SUCCESS;
  
  
  

Mime
View raw message