summaryrefslogtreecommitdiff
path: root/epan/proto.h
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2002-08-02 21:29:45 +0000
committerJörg Mayer <jmayer@loplof.de>2002-08-02 21:29:45 +0000
commit3105ee542f89cd986d0f81d2cd70ce385021d1ce (patch)
tree8ffc7d7c256c3f3e72a0be7cc31aa2a69cdaed81 /epan/proto.h
parent9630bf353e2ca03bdce5d7ce00f184c898ba40cd (diff)
downloadwireshark-3105ee542f89cd986d0f81d2cd70ce385021d1ce.tar.gz
Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the epan/ directory but leave winsock2.h in inet_pton.c and inet_ntop.c for now (can't estimate the consequences). svn path=/trunk/; revision=5928
Diffstat (limited to 'epan/proto.h')
-rw-r--r--epan/proto.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/proto.h b/epan/proto.h
index fe34faf64e..0a70b9d363 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1,7 +1,7 @@
/* proto.h
* Definitions for protocol display
*
- * $Id: proto.h,v 1.33 2002/06/23 10:32:32 guy Exp $
+ * $Id: proto.h,v 1.34 2002/08/02 21:29:39 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,10 +31,6 @@
# include <varargs.h>
#endif
-#ifdef HAVE_WINSOCK2_H
-# include <winsock2.h>
-#endif
-
#include <glib.h>
#include "ipv4.h"