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-rtcp.c | |
| parent | 64c8032c3b617f4be70603e0779905434546a36f (diff) | |
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-rtcp.c')
| -rw-r--r-- | packet-rtcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-rtcp.c b/packet-rtcp.c index 63a633318b..da671fddfb 100644 --- a/packet-rtcp.c +++ b/packet-rtcp.c @@ -1,6 +1,6 @@ /* packet-rtcp.c * - * $Id: packet-rtcp.c,v 1.29 2002/01/20 22:12:27 guy Exp $ + * $Id: packet-rtcp.c,v 1.30 2002/01/21 07:36:41 guy Exp $ * * Routines for RTCP dissection * RTCP = Real-time Transport Control Protocol @@ -44,7 +44,7 @@ #endif #include <glib.h> -#include "packet.h" +#include <epan/packet.h> #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> @@ -61,7 +61,7 @@ #if 0 #include "packet-ntp.h" #endif -#include "conversation.h" +#include <epan/conversation.h> /* Version is the first 2 bits of the first octet*/ #define RTCP_VERSION(octet) ((octet) >> 6) |