summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-06-22 16:05:39 +0000
committerrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-06-22 16:05:39 +0000
commit4995c86425921dca3b62238a909fd24dc1f05ae2 (patch)
tree888ea8453e2c3dcc2c6b1f39c1d7d628dbd0a775 /lib
parent21b98cff9922df4b06bf86e2f924bad1a7687585 (diff)
downloadlibapr-4995c86425921dca3b62238a909fd24dc1f05ae2.tar.gz
Cleanup yesterday's patch to make APR use APR namespace protected macros.
This makes APR use #if instead of #ifdef when using an APR macro. Since APR has stated that it will be using #if always, this is at least a step in that direction. This also fixes a problem with building MMAP that I think I introduced yesterday. Submitted by: Bill Stoddard git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60241 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'lib')
-rw-r--r--lib/apr_pools.c8
-rw-r--r--lib/apr_signal.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/apr_pools.c b/lib/apr_pools.c
index 89ebdf9da..093b78026 100644
--- a/lib/apr_pools.c
+++ b/lib/apr_pools.c
@@ -75,19 +75,19 @@
#ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
#endif
-#ifdef APR_HAVE_SIGNAL_H
+#if APR_HAVE_SIGNAL_H
#include <signal.h>
#endif
-#ifdef APR_HAVE_SYS_WAIT_H
+#if APR_HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
-#ifdef APR_HAVE_SYS_TYPES_H
+#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef APR_HAVE_FCNTL_H
+#if APR_HAVE_FCNTL_H
#include <fcntl.h>
#endif
diff --git a/lib/apr_signal.c b/lib/apr_signal.c
index 340a88bf4..2285664cb 100644
--- a/lib/apr_signal.c
+++ b/lib/apr_signal.c
@@ -54,7 +54,7 @@
#include "apr_private.h"
#include "apr_lib.h"
-#ifdef APR_HAVE_SIGNAL_H
+#if APR_HAVE_SIGNAL_H
#include <signal.h>
#endif