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.c ap_buckets_mmap.c
Date Mon, 23 Oct 2000 19:21:49 GMT
wrowe       00/10/23 12:21:49

  Modified:    src/ap   ap_buckets.c ap_buckets_mmap.c
  Log:
    Fix mmap finally on win32?  With luck.
  
  Revision  Changes    Path
  1.28      +2 -0      apache-2.0/src/ap/ap_buckets.c
  
  Index: ap_buckets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ap_buckets.c	2000/10/16 14:08:21	1.27
  +++ ap_buckets.c	2000/10/23 19:21:47	1.28
  @@ -210,7 +210,9 @@
       ap_insert_bucket_type(&ap_eos_type);
       ap_insert_bucket_type(&ap_file_type);
       ap_insert_bucket_type(&ap_heap_type);
  +#ifdef AP_USE_MMAP_FILES
       ap_insert_bucket_type(&ap_mmap_type);
  +#endif
       ap_insert_bucket_type(&ap_pipe_type);
       ap_insert_bucket_type(&ap_immortal_type);
       ap_insert_bucket_type(&ap_transient_type);
  
  
  
  1.18      +0 -12     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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ap_buckets_mmap.c	2000/10/21 12:11:04	1.17
  +++ ap_buckets_mmap.c	2000/10/23 19:21:48	1.18
  @@ -64,7 +64,6 @@
       apr_status_t ok;
       void *addr;
       
  -#ifdef AP_USE_MMAP_FILES
       ok = apr_mmap_offset(&addr, m->mmap, s->start);
       if (ok != APR_SUCCESS) {
   	return ok;
  @@ -72,9 +71,6 @@
       *str = addr;
       *length = s->end - s->start;
       return APR_SUCCESS;
  -#else
  -    return APR_ENOTIMPL;
  -#endif
   }
   
   static void mmap_destroy(void *data)
  @@ -96,7 +92,6 @@
   {
       ap_bucket_mmap *m;
   
  -#ifdef AP_USE_MMAP_FILES
       m = malloc(sizeof(*m));
       if (m == NULL) {
   	return NULL;
  @@ -112,20 +107,13 @@
       b->type     = &ap_mmap_type;
   
       return b;
  -#else
  -    return APR_ENOTIMPL;
  -#endif
   }
   
   
   AP_DECLARE(ap_bucket *) ap_bucket_create_mmap(
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length)
   {
  -#ifdef AP_USE_MMAP_FILES
       ap_bucket_do_create(ap_bucket_make_mmap(b, mm, start, length));
  -#else
  -    return APR_ENOTIMPL;
  -#endif
   }
   
   const ap_bucket_type ap_mmap_type = {
  
  
  

Mime
View raw message