From b49909da4b77e75ea34751f970ef159021f45ef2 Mon Sep 17 00:00:00 2001 From: Eirik Nygaard Date: Tue, 10 Aug 2004 16:03:12 +0000 Subject: [PATCH] Fix gcc 3.4 build. Reported by: Simon 'corecode' Schubert --- sys/contrib/ipfilter/netinet/ip_log.c | 4 ++-- sys/dev/drm/drm_os_freebsd.h | 6 ++++-- sys/i386/include/physio_proc.h | 5 +++-- sys/platform/pc32/include/physio_proc.h | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c index 2b9772a409..d40ef84b91 100644 --- a/sys/contrib/ipfilter/netinet/ip_log.c +++ b/sys/contrib/ipfilter/netinet/ip_log.c @@ -5,7 +5,7 @@ * * $Id: ip_log.c,v 2.5.2.1 2000/07/19 13:11:47 darrenr Exp $ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.17.2.6 2004/07/05 16:55:16 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.7 2004/07/28 00:22:37 hmp Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.8 2004/08/10 16:03:12 eirikn Exp $ */ #include #if defined(KERNEL) && !defined(_KERNEL) @@ -17,7 +17,7 @@ #endif #if defined(__DragonFly__) || defined(__FreeBSD__) # if defined(IPFILTER_LKM) || defined(_KERNEL) -# if !defined(__FreeBSD_version) +# if !defined(__FreeBSD_version) && !defined(__DragonFly__) # include # endif # if !defined(IPFILTER_LKM) diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h index acfb20b5ef..c6e252438f 100644 --- a/sys/dev/drm/drm_os_freebsd.h +++ b/sys/dev/drm/drm_os_freebsd.h @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.10.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.9 2004/03/01 06:33:14 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.10 2004/08/10 16:03:12 eirikn Exp $ */ #include #include @@ -352,7 +352,9 @@ find_first_zero_bit(volatile void *p, int max) #define DRM_DEBUG(fmt, arg...) do { } while (0) #endif -#if (__FreeBSD_version >= 500000) || ((__FreeBSD_version < 500000) && (__FreeBSD_version >= 410002)) +#if (__FreeBSD_version >= 500000) || \ + ((__FreeBSD_version < 500000) && (__FreeBSD_version >= 410002)) || \ + defined(__DragonFly__) #define DRM_SYSCTL_HANDLER_ARGS (SYSCTL_HANDLER_ARGS) #else #define DRM_SYSCTL_HANDLER_ARGS SYSCTL_HANDLER_ARGS diff --git a/sys/i386/include/physio_proc.h b/sys/i386/include/physio_proc.h index ad8890b51f..18409a0f31 100644 --- a/sys/i386/include/physio_proc.h +++ b/sys/i386/include/physio_proc.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $ */ -/* $DragonFly: src/sys/i386/include/Attic/physio_proc.h,v 1.8 2004/08/02 13:22:32 joerg Exp $ */ +/* $DragonFly: src/sys/i386/include/Attic/physio_proc.h,v 1.9 2004/08/10 16:03:12 eirikn Exp $ */ /* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */ /* $NetBSD$ */ @@ -63,7 +63,8 @@ physio_proc_enter(bp) s = splstatclock(); TAILQ_REMOVE(&physio_proc_freet, pp, pp_chain); -#if !(defined(__DragonFly__) || defined(__FreeBSD__)) || __FreeBSD_version < 400001 +#if !(defined(__DragonFly__) || defined(__FreeBSD__)) || \ + (defined(__FreeBSD_version) && __FreeBSD_version < 400001) pp->pp_proc = bp->b_proc; #endif TAILQ_INSERT_TAIL(&physio_proc_busyt, pp, pp_chain); diff --git a/sys/platform/pc32/include/physio_proc.h b/sys/platform/pc32/include/physio_proc.h index 87b5fbdc20..11aeda24b5 100644 --- a/sys/platform/pc32/include/physio_proc.h +++ b/sys/platform/pc32/include/physio_proc.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $ */ -/* $DragonFly: src/sys/platform/pc32/include/Attic/physio_proc.h,v 1.8 2004/08/02 13:22:32 joerg Exp $ */ +/* $DragonFly: src/sys/platform/pc32/include/Attic/physio_proc.h,v 1.9 2004/08/10 16:03:12 eirikn Exp $ */ /* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */ /* $NetBSD$ */ @@ -63,7 +63,8 @@ physio_proc_enter(bp) s = splstatclock(); TAILQ_REMOVE(&physio_proc_freet, pp, pp_chain); -#if !(defined(__DragonFly__) || defined(__FreeBSD__)) || __FreeBSD_version < 400001 +#if !(defined(__DragonFly__) || defined(__FreeBSD__)) || \ + (defined(__FreeBSD_version) && __FreeBSD_version < 400001) pp->pp_proc = bp->b_proc; #endif TAILQ_INSERT_TAIL(&physio_proc_busyt, pp, pp_chain); -- 2.41.0