diff options
Diffstat (limited to 'globals.h')
-rw-r--r-- | globals.h | 37 |
1 files changed, 1 insertions, 36 deletions
@@ -1,7 +1,7 @@ /* globals.h * Global defines, etc. * - * $Id: globals.h,v 1.21 2000/08/20 07:53:30 guy Exp $ + * $Id: globals.h,v 1.22 2000/09/28 03:16:05 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -27,43 +27,11 @@ #define __GLOBALS_H__ #include <stdio.h> -#include "packet.h" #include "file.h" #include "timestamp.h" #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 packet_info pi; extern capture_file cfile; extern guint main_ctx, file_ctx; extern gchar comp_info_str[256]; @@ -71,11 +39,8 @@ extern gchar *ethereal_path; extern gchar *last_open_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 |