Get rid of check_col() and use ENC.

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

diff --git a/globals.h b/globals.h
index dabc2ae263c42614c5bd6c0580c92531df6db3c9..7e3e526ecd9c91f693056725507c29174eedce4e 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -3,8 +3,8 @@
  *
  * $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
@@ -25,14 +25,17 @@
 #ifndef __GLOBALS_H__
 #define __GLOBALS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include "file.h"
 #include <epan/timestamp.h>
 
 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__ */