summaryrefslogtreecommitdiffstats
path: root/sys/i386/xen/pmap.c
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2010-02-18 14:28:38 +0000
committered <ed@FreeBSD.org>2010-02-18 14:28:38 +0000
commitb53f45c4670742f79dcebb64f9b8d86a546c6650 (patch)
treeee3d049f536e40e0d63cf50f3d7143774cde72af /sys/i386/xen/pmap.c
parent93bada478f1c4bbf241686e05ae90eedebb88c5d (diff)
downloadFreeBSD-src-b53f45c4670742f79dcebb64f9b8d86a546c6650.zip
FreeBSD-src-b53f45c4670742f79dcebb64f9b8d86a546c6650.tar.gz
Allow the pmap code to be built with GCC from FreeBSD 7 again.
This patch basically gives us the best of both worlds. Instead of forcing the compiler to emulate GNU-style inline semantics even though we're using ISO C99, it will only use GNU-style inlining when the compiler is configured that way (__GNUC_GNU_INLINE__). Tested by: jhb
Diffstat (limited to 'sys/i386/xen/pmap.c')
-rw-r--r--sys/i386/xen/pmap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c
index 35f006d..cec1663 100644
--- a/sys/i386/xen/pmap.c
+++ b/sys/i386/xen/pmap.c
@@ -173,7 +173,11 @@ __FBSDID("$FreeBSD$");
#endif
#if !defined(PMAP_DIAGNOSTIC)
+#ifdef __GNUC_GNU_INLINE__
+#define PMAP_INLINE inline
+#else
#define PMAP_INLINE extern inline
+#endif
#else
#define PMAP_INLINE
#endif
OpenPOWER on IntegriCloud