From 0d1e84c0f85f42e5c2ddf10f6977d9f3efe00d85 Mon Sep 17 00:00:00 2001
From: guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Wed, 3 Sep 2003 20:58:09 +0000
Subject: Don't include <epan/conversation.h> if you don't need it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8361 f5534014-38df-0310-8fa8-9805f1628bb7
---
 packet-distcc.c     | 3 +--
 packet-fcip.c       | 3 +--
 packet-fr.c         | 3 +--
 packet-ncp.c        | 3 +--
 packet-pgm.c        | 3 +--
 packet-scsi.c       | 4 ++--
 packet-smb-browse.c | 3 +--
 packet-smb-pipe.c   | 3 +--
 8 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/packet-distcc.c b/packet-distcc.c
index 98bb3760c7..3362d5d456 100644
--- a/packet-distcc.c
+++ b/packet-distcc.c
@@ -3,7 +3,7 @@
  * Copyright 2003, Brad Hards <bradh@frogmouth.net>
  * Copyright 2003, Ronnie Sahlberg, added TCP desegmentation.
  *
- * $Id: packet-distcc.c,v 1.2 2003/05/24 20:49:58 guy Exp $
+ * $Id: packet-distcc.c,v 1.3 2003/09/03 20:58:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -38,7 +38,6 @@
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include <epan/conversation.h>
 
 #include "prefs.h"
 
diff --git a/packet-fcip.c b/packet-fcip.c
index 447f526f8b..708333fef0 100644
--- a/packet-fcip.c
+++ b/packet-fcip.c
@@ -2,7 +2,7 @@
  * Routines for FCIP dissection
  * Copyright 2001, Dinesh G Dutt (ddutt@cisco.com)
  *
- * $Id: packet-fcip.c,v 1.5 2003/09/02 21:10:54 guy Exp $
+ * $Id: packet-fcip.c,v 1.6 2003/09/03 20:58:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,6 @@
 
 #include <epan/packet.h>
 #include "prefs.h"
-#include <epan/conversation.h>
 
 #define FCIP_ENCAP_HEADER_LEN                    28
 #define FCIP_MIN_HEADER_LEN                      16 /* upto frame len field */ 
diff --git a/packet-fr.c b/packet-fr.c
index 1271f302a9..9ad011e072 100644
--- a/packet-fr.c
+++ b/packet-fr.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2001, Paul Ionescu	<paul@acorp.ro>
  *
- * $Id: packet-fr.c,v 1.41 2003/09/03 05:39:21 guy Exp $
+ * $Id: packet-fr.c,v 1.42 2003/09/03 20:58:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -52,7 +52,6 @@
 #include "oui.h"
 #include "nlpid.h"
 #include "greproto.h"
-#include <epan/conversation.h>
 
 /*
  * Bits in the address field.
diff --git a/packet-ncp.c b/packet-ncp.c
index 06b6048dce..33d0181715 100644
--- a/packet-ncp.c
+++ b/packet-ncp.c
@@ -9,7 +9,7 @@
  * Portions Copyright (c) by James Coe 2000-2002
  * Portions Copyright (c) Novell, Inc. 2000-2003
  *
- * $Id: packet-ncp.c,v 1.73 2003/08/25 22:14:07 guy Exp $
+ * $Id: packet-ncp.c,v 1.74 2003/09/03 20:58:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -45,7 +45,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include "prefs.h"
 #include "packet-ipx.h"
 #include "packet-tcp.h"
diff --git a/packet-pgm.c b/packet-pgm.c
index b3889005e1..8950dd39b1 100644
--- a/packet-pgm.c
+++ b/packet-pgm.c
@@ -1,7 +1,7 @@
 /* packet-pgm.c
  * Routines for pgm packet disassembly
  *
- * $Id: packet-pgm.c,v 1.20 2003/03/12 04:04:13 gerald Exp $
+ * $Id: packet-pgm.c,v 1.21 2003/09/03 20:58:09 guy Exp $
  *
  * Copyright (c) 2000 by Talarian Corp
  *
@@ -39,7 +39,6 @@
 #include "in_cksum.h"
 #include <epan/resolv.h>
 #include <epan/strutil.h>
-#include <epan/conversation.h>
 #include "prefs.h"
 
 #include <epan/proto.h>
diff --git a/packet-scsi.c b/packet-scsi.c
index 3a06fef8ff..05c407ec83 100644
--- a/packet-scsi.c
+++ b/packet-scsi.c
@@ -2,7 +2,7 @@
  * Routines for decoding SCSI CDBs and responses
  * Author: Dinesh G Dutt (ddutt@cisco.com)
  *
- * $Id: packet-scsi.c,v 1.32 2003/07/09 03:42:55 guy Exp $
+ * $Id: packet-scsi.c,v 1.33 2003/09/03 20:58:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -82,7 +82,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/strutil.h>
-#include <epan/conversation.h>
+#include <epan/packet.h>
 #include <epan/int-64bit.h>
 #include "prefs.h"
 #include "packet-scsi.h"
diff --git a/packet-smb-browse.c b/packet-smb-browse.c
index 521fbe19f7..9f5f424f3c 100644
--- a/packet-smb-browse.c
+++ b/packet-smb-browse.c
@@ -2,7 +2,7 @@
  * Routines for SMB Browser packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb-browse.c,v 1.31 2003/06/12 08:33:29 guy Exp $
+ * $Id: packet-smb-browse.c,v 1.32 2003/09/03 20:58:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,6 @@
 #include <glib.h>
 #include <ctype.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include "smb.h"
 #include "alignment.h"
 
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c
index 90e1f0a9fd..a5946de45c 100644
--- a/packet-smb-pipe.c
+++ b/packet-smb-pipe.c
@@ -8,7 +8,7 @@ XXX  Fixme : shouldnt show [malformed frame] for long packets
  * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
  * Guy Harris 2001
  *
- * $Id: packet-smb-pipe.c,v 1.95 2003/06/04 05:41:37 guy Exp $
+ * $Id: packet-smb-pipe.c,v 1.96 2003/09/03 20:58:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -42,7 +42,6 @@ XXX  Fixme : shouldnt show [malformed frame] for long packets
 #include <glib.h>
 #include <ctype.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include "smb.h"
 #include "packet-smb-pipe.h"
 #include "packet-smb-browse.h"
-- 
cgit v1.2.3