diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 21:29:45 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 21:29:45 +0000 |
| commit | 3105ee542f89cd986d0f81d2cd70ce385021d1ce (patch) | |
| tree | 8ffc7d7c256c3f3e72a0be7cc31aa2a69cdaed81 /epan/conversation.c | |
| parent | 9630bf353e2ca03bdce5d7ce00f184c898ba40cd (diff) | |
| download | wireshark-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/conversation.c')
| -rw-r--r-- | epan/conversation.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index b0a6c3c96e..38ee4cb679 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -1,7 +1,7 @@ /* conversation.c * Routines for building lists of packets that are part of a "conversation" * - * $Id: conversation.c,v 1.18 2002/05/09 12:10:06 sahlberg Exp $ + * $Id: conversation.c,v 1.19 2002/08/02 21:29:39 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -28,14 +28,6 @@ #include <stdio.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - #include <string.h> #include <glib.h> #include "packet.h" |