In an effort to reduce the use of pinfo->private_data (and some true global variables...

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

diff --git a/globals.h b/globals.h
index fcf5d1586061c6ec9ce76030b968e670afda5330..32ce6fea503eff69c419996ca4affd5ca99fc17d 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -1,10 +1,10 @@
 /* globals.h
  * Global defines, etc.
  *
- * $Id: globals.h,v 1.34 2004/06/01 17:37:10 ulfl 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
@@ -19,7 +19,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __GLOBALS_H__
@@ -28,11 +28,14 @@
 #include "file.h"
 #include <epan/timestamp.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 extern capture_file cfile;
-extern gchar       *ethereal_path;
-#ifdef HAVE_LIBPCAP
-/** @todo move this to the gtk dir */
-extern gboolean     auto_scroll_live;
-#endif
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GLOBALS_H__ */