[Midnightbsd-cvs] src: pf_norm.c: pf_frag_compare fix

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Dec 20 17:41:25 EST 2008


Log Message:
-----------
pf_frag_compare fix

Modified Files:
--------------
    src/sys/contrib/pf/net:
        pf_norm.c (r1.4 -> r1.5)

-------------- next part --------------
Index: pf_norm.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/pf/net/pf_norm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -L sys/contrib/pf/net/pf_norm.c -L sys/contrib/pf/net/pf_norm.c -u -r1.4 -r1.5
--- sys/contrib/pf/net/pf_norm.c
+++ sys/contrib/pf/net/pf_norm.c
@@ -127,15 +127,8 @@
 TAILQ_HEAD(pf_fragqueue, pf_fragment)	pf_fragqueue;
 TAILQ_HEAD(pf_cachequeue, pf_fragment)	pf_cachequeue;
 
-#ifndef __FreeBSD__
-#ifndef __MidnightBSD__
-static __inline int	 pf_frag_compare(struct pf_fragment *,
-			    struct pf_fragment *);
-#else
 static int	 pf_frag_compare(struct pf_fragment *,
 			    struct pf_fragment *);
-#endif
-#endif
 RB_HEAD(pf_frag_tree, pf_fragment)	pf_frag_tree, pf_cache_tree;
 RB_PROTOTYPE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare);
 RB_GENERATE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare);
@@ -204,11 +197,7 @@
 	TAILQ_INIT(&pf_cachequeue);
 }
 
-#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 static int
-#else
-static __inline int
-#endif
 pf_frag_compare(struct pf_fragment *a, struct pf_fragment *b)
 {
 	int	diff;


More information about the Midnightbsd-cvs mailing list