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
This commit is contained in:
parent
f5cf9c8dca
commit
13681cf12b
|
@ -1,7 +1,7 @@
|
||||||
/* column-utils.c
|
/* column-utils.c
|
||||||
* Routines for column utilities.
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@zing.org>
|
* By Gerald Combs <gerald@zing.org>
|
||||||
|
@ -27,6 +27,13 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_TIME_H
|
||||||
|
# include <sys/time.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
#ifdef HAVE_SYS_TYPES_H
|
||||||
# include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -50,9 +57,6 @@
|
||||||
#include "ipv6-utils.h"
|
#include "ipv6-utils.h"
|
||||||
#include "osi-utils.h"
|
#include "osi-utils.h"
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <time.h>
|
|
||||||
|
|
||||||
/* Allocate all the data structures for constructing column data, given
|
/* Allocate all the data structures for constructing column data, given
|
||||||
the number of columns. */
|
the number of columns. */
|
||||||
void
|
void
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* to_str.h
|
/* to_str.h
|
||||||
* Routines for utilities to convert various other types to strings.
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@zing.org>
|
* By Gerald Combs <gerald@zing.org>
|
||||||
|
@ -27,6 +27,10 @@
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_TYPES_H
|
||||||
|
# include <sys/types.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef NEED_SNPRINTF_H
|
#ifdef NEED_SNPRINTF_H
|
||||||
# include "snprintf.h"
|
# include "snprintf.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -35,14 +39,14 @@
|
||||||
# include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
|
||||||
# include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_ARPA_INET_H
|
#ifdef HAVE_ARPA_INET_H
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_SOCKET_H
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef NEED_INET_V6DEFS_H
|
#ifdef NEED_INET_V6DEFS_H
|
||||||
# include "inet_v6defs.h"
|
# include "inet_v6defs.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -51,7 +55,6 @@
|
||||||
# include <sys/time.h>
|
# include <sys/time.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include "to_str.h"
|
#include "to_str.h"
|
||||||
#include "resolv.h"
|
#include "resolv.h"
|
||||||
#include "pint.h"
|
#include "pint.h"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* value_string.c
|
/* value_string.c
|
||||||
* Routines for value_strings
|
* 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
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@zing.org>
|
* By Gerald Combs <gerald@zing.org>
|
||||||
|
@ -29,6 +29,10 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_TIME_H
|
||||||
|
# include <sys/time.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef NEED_SNPRINTF_H
|
#ifdef NEED_SNPRINTF_H
|
||||||
# include "snprintf.h"
|
# include "snprintf.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue