Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Jun 2013 17:33:05 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r252307 - stable/9/contrib/tcpdump
Message-ID:  <201306271733.r5RHX5sx018730@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Thu Jun 27 17:33:04 2013
New Revision: 252307
URL: http://svnweb.freebsd.org/changeset/base/252307

Log:
  Fix build: in a recent pf refactor (head@240233), pf_var.h was modified
  to not include netinet/tcp_fsm.h, and HEAD tcpdump rely on this change
  as the tcp_fsm.h will only be processed once.
  
  Solve this by defining TCPSTATES earlier.  This wouldn't cause breakage
  should pf be merged in the future.
  
  Noticed by:	tinderbox via many
  Pointy hat to:	delphij

Modified:
  stable/9/contrib/tcpdump/print-pfsync.c

Modified: stable/9/contrib/tcpdump/print-pfsync.c
==============================================================================
--- stable/9/contrib/tcpdump/print-pfsync.c	Thu Jun 27 14:32:51 2013	(r252306)
+++ stable/9/contrib/tcpdump/print-pfsync.c	Thu Jun 27 17:33:04 2013	(r252307)
@@ -37,10 +37,10 @@
 
 #include <sys/endian.h>
 #include <net/if.h>
+#define	TCPSTATES
 #include <net/pfvar.h>	/* XXX */
 #include <net/if_pfsync.h>
 #include <netinet/ip.h>
-#define	TCPSTATES
 #include <netinet/tcp_fsm.h>
 
 #include <string.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306271733.r5RHX5sx018730>