From a85cf466cef9af9d9d03d27ca31c3851b0960fa3 Mon Sep 17 00:00:00 2001
From: Gilbert Ramirez <gram@alumni.rice.edu>
Date: Mon, 11 Sep 2000 20:05:13 +0000
Subject: [PATCH] Fix build on Win32.

svn path=/trunk/; revision=2411
---
 strutil.c | 3 ++-
 strutil.h | 7 ++++++-
 tvbuff.c  | 6 +++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/strutil.c b/strutil.c
index e061cb77a0..e08a9a9250 100644
--- a/strutil.c
+++ b/strutil.c
@@ -1,7 +1,7 @@
 /* strutil.c
  * String utility routines
  *
- * $Id: strutil.c,v 1.1 2000/09/11 16:16:13 gram Exp $
+ * $Id: strutil.c,v 1.2 2000/09/11 20:05:13 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib.h>
+#include "strutil.h"
 
 
 /*
diff --git a/strutil.h b/strutil.h
index 56607a77c0..bc28d4445e 100644
--- a/strutil.h
+++ b/strutil.h
@@ -1,7 +1,7 @@
 /* util.h
  * Utility definitions
  *
- * $Id: strutil.h,v 1.1 2000/09/11 16:16:13 gram Exp $
+ * $Id: strutil.h,v 1.2 2000/09/11 20:05:13 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -26,6 +26,11 @@
 #ifndef __STRUTIL_H__
 #define __STRUTIL_H__
 
+/* ... thus, config.h needs to be #included */
+#ifdef HAVE_WINSOCK_H
+# include <winsock.h>	/* for u_char */
+#endif
+
 const u_char *find_line_end(const u_char *data, const u_char *dataend,
     const u_char **eol);
 int        get_token_len(const u_char *linep, const u_char *lineend,
diff --git a/tvbuff.c b/tvbuff.c
index 1b2953e185..f748c4337a 100644
--- a/tvbuff.c
+++ b/tvbuff.c
@@ -9,7 +9,7 @@
  * 		the data of a backing tvbuff, or can be a composite of
  * 		other tvbuffs.
  *
- * $Id: tvbuff.c,v 1.14 2000/09/11 16:16:13 gram Exp $
+ * $Id: tvbuff.c,v 1.15 2000/09/11 20:05:13 gram Exp $
  *
  * Copyright (c) 2000 by Gilbert Ramirez <gram@xiexie.org>
  *
@@ -33,6 +33,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <string.h>
 
 #include "pint.h"