diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-21 07:37:49 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-21 07:37:49 +0000 |
commit | 5904f05078da51a512d77f38d40d943a300e3e8c (patch) | |
tree | 8bf88b7d322dbff0c32339f1136ea77ad7dda975 /column.c | |
parent | 0d9b33da275ff33df0d8ed48816257398376c42b (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/").
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4586 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'column.c')
-rw-r--r-- | column.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1,12 +1,11 @@ /* column.c * Routines for handling column preferences * - * $Id: column.c,v 1.34 2001/07/22 21:56:25 guy Exp $ + * $Id: column.c,v 1.35 2002/01/21 07:36:31 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -44,10 +43,10 @@ #include <sys/stat.h> #endif -#include "timestamp.h" +#include <epan/timestamp.h> #include "prefs.h" #include "column.h" -#include "packet.h" +#include <epan/packet.h> /* Given a format number (as defined in packet.h), returns its equivalent string */ |