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-ftp.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-ftp.c')
-rw-r--r-- | packet-ftp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-ftp.c b/packet-ftp.c index e5e615fa9a..89dada09b7 100644 --- a/packet-ftp.c +++ b/packet-ftp.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 2001, Juan Toledo <toledo@users.sourceforge.net> (Passive FTP) * - * $Id: packet-ftp.c,v 1.39 2001/12/10 00:25:27 guy Exp $ + * $Id: packet-ftp.c,v 1.40 2002/01/21 07:36:34 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -44,9 +44,9 @@ #include <string.h> #include <glib.h> -#include "packet.h" -#include "strutil.h" -#include "conversation.h" +#include <epan/packet.h> +#include <epan/strutil.h> +#include <epan/conversation.h> static int proto_ftp = -1; static int proto_ftp_data = -1; |