httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@covalent.net
Subject RE: cvs commit: apache-2.0/src/ap ap_buckets_mmap.c
Date Tue, 17 Oct 2000 03:53:09 GMT
On Mon, 16 Oct 2000, William A. Rowe, Jr. wrote:

> 
> This was a really ugly hack to get Win32 building again...
> 
> Bucket folks, do you have a better patch (or, was this already patched?)

It hasn't been patched yet.  Hmmm...  It seems to me that the cleanest way
to do this, is to just not compile this file on platforms without MMAP
files, and don't register the MMAP bucket type on those platforms
either.  I would personally do all of this with some well placed
#ifdefs.  :-)

Ryan

> 
> > 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
> >   
> >   
> >   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;
> >   
> >   
> >   
> > 
> 


_______________________________________________________________________________
Ryan Bloom                        	rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------


Mime
View raw message