diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-04-02 02:30:06 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-04-02 02:30:06 +0000 |
| commit | 13681cf12b054ba9fdd6da138baf00afdc61ed03 (patch) | |
| tree | d3d19f58be70ac1bcf5347faadf6c03619691744 | |
| parent | f5cf9c8dcaebd81935264cbcc55bb6de1fa98ba2 (diff) | |
| download | wireshark-13681cf12b054ba9fdd6da138baf00afdc61ed03.tar.gz wireshark-13681cf12b054ba9fdd6da138baf00afdc61ed03.tar.bz2 wireshark-13681cf12b054ba9fdd6da138baf00afdc61ed03.zip | |
Include <sys/time.h> as well as <time.h> in "column-utils.c" and
"value_string.c", as they include "epan/to_str.h", and that uses "struct
timeval" in some function prototypes.
In "to_str.c", include <sys/types.h> before including <netinet/in.h>; on
at least some platforms, definitions in <netinet/in.h> require types
defined in <sys/types.h>.
In "to_str.c", include <sys/socket.h>, so that AF_INET6 is defined.
svn path=/trunk/; revision=3238
| -rw-r--r-- | epan/column-utils.c | 12 | ||||
| -rw-r--r-- | epan/to_str.c | 15 | ||||
| -rw-r--r-- | epan/value_string.c | 6 |
3 files changed, 22 insertions, 11 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 5b514cb3be..731e9e3046 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1,7 +1,7 @@ /* column-utils.c * Routines for column utilities. * - * $Id: column-utils.c,v 1.1 2001/04/01 07:32:35 hagbard Exp $ + * $Id: column-utils.c,v 1.2 2001/04/02 02:30:06 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -27,6 +27,13 @@ # include "config.h" #endif +#include <string.h> +#include <time.h> + +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif + #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -50,9 +57,6 @@ #include "ipv6-utils.h" #include "osi-utils.h" -#include <string.h> -#include <time.h> - /* Allocate all the data structures for constructing column data, given the number of columns. */ void diff --git a/epan/to_str.c b/epan/to_str.c index 7462442d1d..eb815d2355 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -1,7 +1,7 @@ /* to_str.h * Routines for utilities to convert various other types to strings. * - * $Id: to_str.c,v 1.3 2001/04/01 17:35:21 hagbard Exp $ + * $Id: to_str.c,v 1.4 2001/04/02 02:30:06 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -27,6 +27,10 @@ # include "config.h" #endif +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + #ifdef NEED_SNPRINTF_H # include "snprintf.h" #endif @@ -35,14 +39,14 @@ # include <netinet/in.h> #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + #ifdef NEED_INET_V6DEFS_H # include "inet_v6defs.h" #endif @@ -51,7 +55,6 @@ # include <sys/time.h> #endif - #include "to_str.h" #include "resolv.h" #include "pint.h" diff --git a/epan/value_string.c b/epan/value_string.c index 66e0150e66..1478046674 100644 --- a/epan/value_string.c +++ b/epan/value_string.c @@ -1,7 +1,7 @@ /* value_string.c * Routines for value_strings * - * $Id: value_string.c,v 1.1 2001/04/01 03:18:41 hagbard Exp $ + * $Id: value_string.c,v 1.2 2001/04/02 02:30:06 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -29,6 +29,10 @@ #include <stdio.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif + #ifdef NEED_SNPRINTF_H # include "snprintf.h" #endif |