Added two new arguments to epan_init() and proto_init() to

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

diff --git a/globals.h b/globals.h
index 873d4fc1f24fdb9cb40cb9a46e02f0dc5213c699..49122e97c3d429982fc93055bdaaba44d827b2fe 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -1,7 +1,7 @@
 /* globals.h
  * Global defines, etc.
  *
- * $Id: globals.h,v 1.10 1999/10/02 19:24:19 guy Exp $
+ * $Id: globals.h,v 1.24 2001/03/27 06:48:11 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -26,81 +26,19 @@
 #ifndef __GLOBALS_H__
 #define __GLOBALS_H__
 
-#ifndef _STDIO_H_
 #include <stdio.h>
-#endif
-
-#ifndef __PACKET_H__
-#include "packet.h"
-#endif
-
-#ifndef __GTK_H__
-#include <gtk/gtk.h>
-#endif
-
-#ifndef __PRINT_H__
-#include "print.h"
-#endif
-
-#ifndef __FILE_H__
 #include "file.h"
-#endif
-
-#ifndef __TIMESTAMP_H__
 #include "timestamp.h"
-#endif
 
 #define MIN_PACKET_SIZE 68     /* minimum amount of packet data we can read */
 
-/* Byte swapping routines */
-#define SWAP16(x) \
-  ( (((x) & 0x00ff) << 8) | \
-    (((x) & 0xff00) >> 8) )
-#define SWAP32(x) \
-  ( (((x) & 0x000000ff) << 24) | \
-    (((x) & 0x0000ff00) <<  8) | \
-    (((x) & 0x00ff0000) >>  8) | \
-    (((x) & 0xff000000) >> 24) )
-
-/* Byte ordering */
-#ifndef BYTE_ORDER
-# define LITTLE_ENDIAN 4321
-# define BIG_ENDIAN 1234
-# ifdef WORDS_BIGENDIAN
-#  define BYTE_ORDER BIG_ENDIAN
-# else
-#  define BYTE_ORDER LITTLE_ENDIAN
-# endif
-#endif
-
-/* From the K&R book, p. 89 */
-#ifndef MAX
-# define MAX(x, y) ((x) > (y) ? (x) : (y))
-#endif
-
-#ifndef MIN
-# define MIN(x, y) ((x) < (y) ? (x) : (y))
-#endif
-
-extern FILE        *data_out_file;
-extern packet_info  pi;
-extern capture_file cf;
-extern GtkWidget   *file_sel, *packet_list, *tree_view, *byte_view, *prog_bar,
-            *info_bar;
-extern GdkFont     *m_r_font, *m_b_font;
+extern capture_file cfile;
 extern guint        main_ctx, file_ctx;
-extern gchar        comp_info_str[256];
 extern gchar       *ethereal_path;
-extern gchar       *medium_font;
-extern gchar       *bold_font;
 extern gchar       *last_open_dir;
 extern gboolean     auto_scroll_live;
-extern int          g_resolving_actif;
+extern field_info  *finfo_selected;
 
 extern ts_type timestamp_type;
 
-extern GtkStyle *item_style;
-
-#define PF_DIR ".ethereal"
-
 #endif