From 13681cf12b054ba9fdd6da138baf00afdc61ed03 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 2 Apr 2001 02:30:06 +0000
Subject: [PATCH] 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
---
 epan/column-utils.c | 12 ++++++++----
 epan/to_str.c       | 15 +++++++++------
 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