Move the declaration of global variables involved with packet capture

from "globals.h" to "capture.h".

Only "capture.c" needs to include <pcap.h>; move the include of <pcap.h>
from "capture.h" to "capture.c".

We no longer need any DLT_ defines (that's handled inside Wiretap);
remove the defines of DLT_ from "capture.h".

svn path=/trunk/; revision=753

4 files changed, 18 insertions, 32 deletions

diff --git a/capture.c b/capture.c
index e22616bfde..54c6f37fa8 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
 /* capture.c
  * Routines for packet capture windows
  *
- * $Id: capture.c,v 1.77 1999/10/02 06:26:45 guy Exp $
+ * $Id: capture.c,v 1.78 1999/10/02 19:24:18 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -75,6 +75,10 @@
 # include "snprintf.h"
 #endif
 
+#ifndef lib_pcap_h
+#include <pcap.h>
+#endif
+
 #include "gtk/main.h"
 #include "packet.h"
 #include "file.h"
diff --git a/capture.h b/capture.h
index 555dbab72f..598d30cf6f 100644
--- a/capture.h
+++ b/capture.h
@@ -1,7 +1,7 @@
 /* capture.h
  * Definitions for packet capture windows
  *
- * $Id: capture.h,v 1.19 1999/10/02 06:26:45 guy Exp $
+ * $Id: capture.h,v 1.20 1999/10/02 19:24:19 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -28,29 +28,15 @@
 
 #ifdef HAVE_LIBPCAP
 
-#ifndef lib_pcap_h
-#include <pcap.h>
-#endif
-
-/* The version of pcap.h that comes with some systems is missing these
- * #defines.
- */
-
-#ifndef DLT_RAW
-#define DLT_RAW 12
-#endif
-
-#ifndef DLT_SLIP_BSDOS
-#define DLT_SLIP_BSDOS 13
-#endif
-
-#ifndef DLT_PPP_BSDOS
-#define DLT_PPP_BSDOS 14
-#endif
-
 /* Name we give to the child process when doing a "-S" or "-F" capture. */
 #define	CHILD_NAME	"ethereal-capture"
 
+extern int sync_mode;	/* allow sync */
+extern int sync_pipe[2]; /* used to sync father */
+extern int fork_mode;	/* fork a child to do the capture */
+extern int quit_after_cap; /* Makes a "capture only mode". Implies -k */
+extern gboolean capture_child;	/* if this is the child for "-F"/"-S" */
+
 /* Open a specified file, or create a temporary file, and start a capture
    to the file in question. */
 void   do_capture(char *capfile_name);
diff --git a/globals.h b/globals.h
index 3fee9ae665..873d4fc1f2 100644
--- a/globals.h
+++ b/globals.h
@@ -1,7 +1,7 @@
 /* globals.h
  * Global defines, etc.
  *
- * $Id: globals.h,v 1.9 1999/09/30 06:49:54 guy Exp $
+ * $Id: globals.h,v 1.10 1999/10/02 19:24:19 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -101,14 +101,6 @@ extern ts_type timestamp_type;
 
 extern GtkStyle *item_style;
 
-#ifdef HAVE_LIBPCAP
-extern int sync_mode;	/* allow sync */
-extern int sync_pipe[2]; /* used to sync father */
-extern int fork_mode;	/* fork a child to do the capture */
-extern int quit_after_cap; /* Makes a "capture only mode". Implies -k */
-extern gboolean capture_child;	/* if this is the child for "-F"/"-S" */
-#endif
-
 #define PF_DIR ".ethereal"
 
 #endif
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 72c3a9ab70..bcd3a1931a 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -1,7 +1,7 @@
 /* file_dlg.c
  * Dialog boxes for handling files
  *
- * $Id: file_dlg.c,v 1.4 1999/09/23 07:20:20 guy Exp $
+ * $Id: file_dlg.c,v 1.5 1999/10/02 19:24:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -57,6 +57,10 @@
 #include "menu.h"
 #endif
 
+#ifdef HAVE_LIBPCAP
+#include "capture.h"
+#endif
+
 static void file_open_ok_cb(GtkWidget *w, GtkFileSelection *fs);
 static void file_save_ok_cb(GtkWidget *w, GtkFileSelection *fs);
 static void file_save_as_ok_cb(GtkWidget *w, GtkFileSelection *fs);