diff options
author | Guy Harris <guy@alum.mit.edu> | 1999-09-10 07:19:51 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 1999-09-10 07:19:51 +0000 |
commit | dc298db578760aaa48d2b835ad322b95a98ce2f1 (patch) | |
tree | 03a63606705cd063ea23b5b324175c575e302432 /gtk | |
parent | f9f2bf9a28595c2cd304a66a72e1e906f2ceb0e7 (diff) |
Give "globals.h" an RCS ID and copyright/GPL notice.
Move some defines that would be used even by a non-GTK+-based Ethereal
from "gtk/main.h" to "globals.h".
Remove the byte-order #defines from "packet.h", as they're now in
"globals.h" (having been moved there from "gtk/main.h").
Fix up some files that use those #defines to include "globals.h".
"resolv.c" doesn't use any GTK stuff, so it needn't include <gtk/gtk.h>
nor "gtk/main.h" - it only did so to get the byte-order #defines for the
benefit of "packet-ipv6.h", and "packet-ipv6.h" now includes them
itself.
svn path=/trunk/; revision=649
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/main.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/gtk/main.h b/gtk/main.h index eb8374b84c..68e5d261bc 100644 --- a/gtk/main.h +++ b/gtk/main.h @@ -1,7 +1,7 @@ /* ethereal.h * Global defines, etc. * - * $Id: main.h,v 1.2 1999/09/09 03:32:02 gram Exp $ + * $Id: main.h,v 1.3 1999/09/10 07:19:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -45,29 +45,6 @@ #define DEF_READY_MESSAGE " Ready to load file" #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 - typedef struct _selection_info { GtkWidget *tree; GtkWidget *text; |