Get rid of check_col() and use ENC.

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

diff --git a/globals.h b/globals.h
index de1590b261f940331679d851a418a6c9d69a85b0..7e3e526ecd9c91f693056725507c29174eedce4e 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -1,10 +1,10 @@
 /* globals.h
  * Global defines, etc.
  *
- * $Id: globals.h,v 1.33 2004/03/18 19:04:31 obiot 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
@@ -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;
-extern gchar       *last_open_dir;
-#ifdef HAVE_LIBPCAP
-extern gboolean     auto_scroll_live;
-#endif
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GLOBALS_H__ */