From owner-svn-src-all@FreeBSD.ORG  Thu Jun 27 17:33:05 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id CE9AA33D;
 Thu, 27 Jun 2013 17:33:05 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BF7A613CC;
 Thu, 27 Jun 2013 17:33:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5RHX5NW018731;
 Thu, 27 Jun 2013 17:33:05 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5RHX5sx018730;
 Thu, 27 Jun 2013 17:33:05 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306271733.r5RHX5sx018730@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 27 Jun 2013 17:33:05 +0000 (UTC)
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
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Jun 2013 17:33:05 -0000

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>