From owner-svn-ports-head@FreeBSD.ORG Fri Oct 11 15:30:43 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 15276340; Fri, 11 Oct 2013 15:30:43 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 02B342D38; Fri, 11 Oct 2013 15:30:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BFUgPI042102; Fri, 11 Oct 2013 15:30:42 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BFUgXp042101; Fri, 11 Oct 2013 15:30:42 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201310111530.r9BFUgXp042101@svn.freebsd.org> From: Joe Marcus Clarke Date: Fri, 11 Oct 2013 15:30:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330082 - head/net/wireshark/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 15:30:43 -0000 Author: marcus Date: Fri Oct 11 15:30:42 2013 New Revision: 330082 URL: http://svnweb.freebsd.org/changeset/ports/330082 Log: Fix the build on 10.X and HEAD. Submitted by: Gustau PĂ©rez Added: head/net/wireshark/files/patch-epan_dissectors_packet-gluster.h (contents, props changed) Added: head/net/wireshark/files/patch-epan_dissectors_packet-gluster.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/wireshark/files/patch-epan_dissectors_packet-gluster.h Fri Oct 11 15:30:42 2013 (r330082) @@ -0,0 +1,19 @@ +--- epan/dissectors/packet-gluster.h.orig 2013-10-10 23:19:31.007195841 +0000 ++++ epan/dissectors/packet-gluster.h 2013-10-10 23:20:32.550304872 +0000 +@@ -354,6 +354,8 @@ + GFS3_OP_MAXVALUE + }; + ++# if !defined(__FreeBSD__) ++ + /* dir-entry types from libglusterfs/src/compat.h */ + enum gluster_entry_types { + DT_UNKNOWN = 0, +@@ -367,6 +369,7 @@ + DT_WHT = 14 + }; + ++# endif + + /* LOCKING operators come from libglusterfs/src/glusterfs.h */ +