rbb 00/12/31 16:33:42
Modified: src/buckets ap_buckets.c ap_buckets_file.c
Log:
We have to use #if, not #ifdef
Revision Changes Path
1.41 +1 -1 apr-util/src/buckets/ap_buckets.c
Index: ap_buckets.c
===================================================================
RCS file: /home/cvs/apr-util/src/buckets/ap_buckets.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ap_buckets.c 2001/01/01 00:29:56 1.40
+++ ap_buckets.c 2001/01/01 00:33:42 1.41
@@ -260,7 +260,7 @@
ap_insert_bucket_type(&ap_eos_type);
ap_insert_bucket_type(&ap_file_type);
ap_insert_bucket_type(&ap_heap_type);
-#ifdef APR_HAS_MMAP
+#if APR_HAS_MMAP
ap_insert_bucket_type(&ap_mmap_type);
#endif
ap_insert_bucket_type(&ap_pipe_type);
1.17 +4 -4 apr-util/src/buckets/ap_buckets_file.c
Index: ap_buckets_file.c
===================================================================
RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_file.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ap_buckets_file.c 2001/01/01 00:29:56 1.16
+++ ap_buckets_file.c 2001/01/01 00:33:42 1.17
@@ -59,7 +59,7 @@
#include <stdlib.h>
/* Allow Apache to use ap_mmap */
-#ifdef APR_HAS_MMAP
+#if APR_HAS_MMAP
#include "apr_mmap.h"
/* mmap support for static files based on ideas from John Heidemann's
@@ -93,11 +93,11 @@
ap_bucket *b = NULL;
char *buf;
apr_status_t rv;
-#ifdef APR_HAS_MMAP
+#if APR_HAS_MMAP
apr_mmap_t *mm = NULL;
#endif
-#ifdef APR_HAS_MMAP
+#if APR_HAS_MMAP
if ((e->length >= MMAP_THRESHOLD)
&& (e->length < MMAP_LIMIT)) {
/* we need to protect ourselves in case we die while we've got the
@@ -155,7 +155,7 @@
b = ap_bucket_create_file(f, 0, e->length);
AP_BUCKET_INSERT_AFTER(e, b);
}
-#ifdef APR_HAS_MMAP
+#if APR_HAS_MMAP
}
#endif
return APR_SUCCESS;