X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=globals.h;h=7e3e526ecd9c91f693056725507c29174eedce4e;hb=a303eebd46a265ea7449fda367627d1b47d3b909;hp=94b37fd91f7e43df02b948e0136965d9ba5339fa;hpb=f59cc854a9689383e05c170c75041fdd0757452b;p=obnox%2Fwireshark%2Fwip.git

diff --git a/globals.h b/globals.h
index 94b37fd91f..7e3e526ecd 100644
--- a/globals.h
+++ b/globals.h
@@ -1,22 +1,22 @@
 /* globals.h
  * Global defines, etc.
  *
- * $Id: globals.h,v 1.27 2002/01/10 11:05:48 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * 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.
@@ -25,20 +25,17 @@
 #ifndef __GLOBALS_H__
 #define __GLOBALS_H__
 
-#include <stdio.h>
-#include "file.h"
-#include "timestamp.h"
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
-#define MIN_PACKET_SIZE 68	/* minimum amount of packet data we can read */
+#include "file.h"
+#include <epan/timestamp.h>
 
 extern capture_file cfile;
-extern gchar       *ethereal_path;
-extern gchar       *last_open_dir;
-#ifdef HAVE_LIBPCAP
-extern gboolean     auto_scroll_live;
-#endif
-extern field_info  *finfo_selected;
 
-extern ts_type timestamp_type;
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
-#endif
+#endif /* __GLOBALS_H__ */