diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-21 07:37:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-21 07:37:49 +0000 |
| commit | ee5ca25d31984b9768d5ae9419dea0e3b493b479 (patch) | |
| tree | 8bf88b7d322dbff0c32339f1136ea77ad7dda975 /packet-rtp.c | |
| parent | 64c8032c3b617f4be70603e0779905434546a36f (diff) | |
| download | wireshark-ee5ca25d31984b9768d5ae9419dea0e3b493b479.tar.gz wireshark-ee5ca25d31984b9768d5ae9419dea0e3b493b479.tar.bz2 wireshark-ee5ca25d31984b9768d5ae9419dea0e3b493b479.zip | |
Include files from the "epan" directory and subdirectories thereof with
"epan/..." pathnames, so as to avoid collisions with header files in any
of the directories in which we look (e.g., "proto.h", as some other
package has its own "proto.h" file which it installs in the top-level
include directory).
Don't add "-I" flags to search "epan", as that's no longer necessary
(and we want includes of "epan" headers to fail if the "epan/" is left
out, so that we don't re-introduce includes lacking "epan/").
svn path=/trunk/; revision=4586
Diffstat (limited to 'packet-rtp.c')
| -rw-r--r-- | packet-rtp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-rtp.c b/packet-rtp.c index d04e3e38de..9bcc052c5e 100644 --- a/packet-rtp.c +++ b/packet-rtp.c @@ -6,7 +6,7 @@ * Copyright 2000, Philips Electronics N.V. * Written by Andreas Sikkema <andreas.sikkema@philips.com> * - * $Id: packet-rtp.c,v 1.31 2001/12/10 00:25:33 guy Exp $ + * $Id: packet-rtp.c,v 1.32 2002/01/21 07:36:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -56,7 +56,7 @@ #endif #include <glib.h> -#include "packet.h" +#include <epan/packet.h> #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> @@ -70,7 +70,7 @@ #include <string.h> #include "packet-rtp.h" -#include "conversation.h" +#include <epan/conversation.h> /* RTP header fields */ static int proto_rtp = -1; |