summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2013-01-07 18:43:34 +0000
committerBrad Smith <brad@cvs.openbsd.org>2013-01-07 18:43:34 +0000
commita9dc703f346eeebf5f5da28b064af6ec936eb4c4 (patch)
tree3ea9c7f5fda0f7cf9dc96659b782f9730d97a824 /usr.sbin/httpd
parent7757cc998ef9dfa1e15e20f680d1abeb364254ee (diff)
Use __attribute__((__gnu_inline__)) with __inline__ if __GNUC_STDC_INLINE__
is defined. Fixes build with LLVM. From and OK millert@
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/src/include/ap_config.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/httpd/src/include/ap_config.h b/usr.sbin/httpd/src/include/ap_config.h
index 804c164d0e7..27c16b1b8e7 100644
--- a/usr.sbin/httpd/src/include/ap_config.h
+++ b/usr.sbin/httpd/src/include/ap_config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ap_config.h,v 1.23 2009/03/10 10:56:40 martynas Exp $ */
+/* $OpenBSD: ap_config.h,v 1.24 2013/01/07 18:43:33 brad Exp $ */
/* ====================================================================
* The Apache Software License, Version 1.1
@@ -86,7 +86,11 @@ extern "C" {
* functions). Only do this in gcc 2.7 or later ... it may work
* on earlier stuff, but why chance it.
*/
+#ifdef __GNUC_STDC_INLINE__
+#define ap_inline __inline__ __attribute__((__gnu_inline__))
+#else
#define ap_inline __inline__
+#endif
#define USE_GNU_INLINE
#define ENUM_BITFIELD(e,n,w) e n : w