Use apr_want.h to get the declarations for ntohs et al instead of

including the appropriate system header files directly.

This gets rid of a warning for props.c on FreeBSD 3.4 which cropped
up when I included the right header file to get OS/390 to build :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88132 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/mod_access.c b/modules/aaa/mod_access.c
index 11ef94e354f111680c0f709bb1299377f0d2bf7c..4a1afa3bb8538e5328b5a19b5b5d5daf66af8dcc 100644 (file)
--- a/modules/aaa/mod_access.c
+++ b/modules/aaa/mod_access.c
@@ -68,6 +68,7 @@
 #include "apr_lib.h"
 
 #define APR_WANT_STRFUNC
+#define APR_WANT_BYTEFUNC
 #include "apr_want.h"
 
 #include "ap_config.h"
@@ -80,10 +81,6 @@
 #if APR_HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if APR_HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
 
 enum allowdeny_type {
     T_ENV,

diff --git a/modules/dav/main/props.c b/modules/dav/main/props.c
index 848bc9ba7332937a62ad0b66033ad40e9d8af00b..49982189b96fe01614921daecc3743b407948875 100644 (file)
--- a/modules/dav/main/props.c
+++ b/modules/dav/main/props.c
@@ -181,12 +181,9 @@
 #include "apr.h"
 #include "apr_strings.h"
 
-#if APR_HAVE_STDIO_H
-#include <stdio.h>              /* for sprintf() */
-#endif
-#if APR_HAVE_ARPA_INET_H
-#include <arpa/inet.h>          /* for ntohs(), htons() */
-#endif
+#define APR_WANT_STDIO
+#define APR_WANT_BYTEFUNC
+#include "apr_want.h"
 
 #include "mod_dav.h"