trawick 01/02/13 04:10:58
Modified: include apr_want.h
Log:
Including the right header file(s) for ntohl et al is a little bit
cumbersome, so teach apr_want.h how to do that on the app's behalf
when it specifies APR_WANT_BYTEFUNC.
Revision Changes Path
1.5 +20 -0 apr/include/apr_want.h
Index: apr_want.h
===================================================================
RCS file: /home/cvs/apr/include/apr_want.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apr_want.h 2001/02/11 00:39:55 1.4
+++ apr_want.h 2001/02/13 12:10:54 1.5
@@ -62,6 +62,7 @@
* APR_WANT_STDIO: <stdio.h> and related bits
* APR_WANT_IOVEC: struct iovec
* APR_WANT_SIGNAL: signal numbers, functions, and types
+ * APR_WANT_BYTEFUNC: htons, htonl, ntohl, ntohs
*
* Typical usage:
*
@@ -135,3 +136,22 @@
#endif
/* --------------------------------------------------------------------- */
+
+#ifdef APR_WANT_BYTEFUNC
+
+/* Single Unix says they are in arpa/inet.h. Linux has them in
+ * netinet/in.h. FreeBSD has them in arpa/inet.h but requires that
+ * netinet/in.h be included first.
+ */
+#if APR_HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#if APR_HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#undef APR_WANT_BYTEFUNC
+#endif
+
+/* --------------------------------------------------------------------- */
+
