Avoid calling some free() on WIN32 on memory that may be allocated in

[obnox/wireshark/wip.git] / globals.h

diff --git a/globals.h b/globals.h
index 49d46c2a11fb37cd7fbd561e824e32e8e652c976..d920fba1a25417a650fda4eb859194a71c964c80 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -1,50 +1,37 @@
+/* globals.h
+ * Global defines, etc.
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
 #ifndef __GLOBALS_H__
 #define __GLOBALS_H__
 
-#ifndef _STDIO_H_
-#include <stdio.h>
-#endif
-
-#ifndef __PACKET_H__
-#include "packet.h"
-#endif
-
-#ifndef __GTK_H__
-#include <gtk/gtk.h>
-#endif
-
-#ifndef __FILE_H__
 #include "file.h"
-#endif
-
-#ifndef __TIMESTAMP_H__
-#include "timestamp.h"
-#endif
-
-extern FILE        *data_out_file;
-extern packet_info  pi;
-extern capture_file cf;
-extern GtkWidget   *file_sel, *packet_list, *tree_view, *byte_view, *prog_bar,
-            *info_bar;
-extern GdkFont     *m_r_font, *m_b_font;
-extern guint        main_ctx, file_ctx;
-extern gint         start_capture;
-extern gchar        comp_info_str[256];
-extern gchar       *ethereal_path;
-extern gchar       *medium_font;
-extern gchar       *bold_font;
-extern gchar       *last_open_dir;
-
-extern ts_type timestamp_type;
-
-extern GtkStyle *item_style;
+#include <epan/timestamp.h>
 
+extern capture_file cfile;
 #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 sigusr2_received;
-extern int quit_after_cap; /* Makes a "capture only mode". Implies -k */
+/** @todo move this to the gtk dir */
+extern gboolean     auto_scroll_live;
 #endif
 
 #endif