If we don't have any of the pcap_datalink_XXX_to_YYY routines,

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

diff --git a/globals.h b/globals.h
index 5b543560491c5b0b3c1c4511f2716ef51141a830..d920fba1a25417a650fda4eb859194a71c964c80 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -1,23 +1,22 @@
 /* globals.h
  * Global defines, etc.
  *
- * $Id: globals.h,v 1.18 2000/06/27 04:35:45 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * 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
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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.
@@ -26,70 +25,13 @@
 #ifndef __GLOBALS_H__
 #define __GLOBALS_H__
 
-#ifndef _STDIO_H_
-#include <stdio.h>
-#endif
-
-#ifndef __PACKET_H__
-#include "packet.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 */
+#include <epan/timestamp.h>
 
-/* 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 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;
+#ifdef HAVE_LIBPCAP
+/** @todo move this to the gtk dir */
 extern gboolean     auto_scroll_live;
-extern int          g_resolving_actif;
-extern gboolean     g_ip_dscp_actif;
-extern field_info  *finfo_selected;
-
-extern ts_type timestamp_type;
-
-#define PF_DIR ".ethereal"
+#endif
 
 #endif