diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-07-15 20:57:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-07-15 20:57:13 +0000 |
| commit | e0dc69929e88cc74aaf359f7a1d3f2e7cf9edbc4 (patch) | |
| tree | 19388b8a7de7395df0faa5390a5a777aac7172e1 /text2pcap.c | |
| parent | 736c64296e0eefea9bd2a49b1552040ca269e4ca (diff) | |
From Joerg Mayer:
Replace our own definitions of TRUE/FALSE by their glib.h
equivalents. Put sys/types.h into ifdefs.
svn path=/trunk/; revision=5880
Diffstat (limited to 'text2pcap.c')
| -rw-r--r-- | text2pcap.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/text2pcap.c b/text2pcap.c index 9ec9f31441..b716439013 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -6,7 +6,7 @@ * * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com> * - * $Id: text2pcap.c,v 1.18 2002/06/30 20:28:54 guy Exp $ + * $Id: text2pcap.c,v 1.19 2002/07/15 20:57:13 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -93,17 +93,24 @@ #define __USE_XOPEN #include <time.h> +#include <glib.h> + +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif -#include <sys/types.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_WINSOCK2_H # include <winsock2.h> #endif + #include <errno.h> #include <assert.h> @@ -115,14 +122,6 @@ # include "strptime.h" #endif -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef FALSE -#define FALSE 0 -#endif - #include "text2pcap.h" /*--- Options --------------------------------------------------------------------*/ |