[ssh] don't THROW() an exception from a dissector

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

diff --git a/globals.h b/globals.h
index d920fba1a25417a650fda4eb859194a71c964c80..032c5028233fb43bb71da40b581f8dffea0034db 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -1,8 +1,6 @@
 /* globals.h
  * Global defines, etc.
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -19,7 +17,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,10 +26,27 @@
 #include "file.h"
 #include <epan/timestamp.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 extern capture_file cfile;
-#ifdef HAVE_LIBPCAP
-/** @todo move this to the gtk dir */
-extern gboolean     auto_scroll_live;
-#endif
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GLOBALS_H__ */
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */