From ee5ca25d31984b9768d5ae9419dea0e3b493b479 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 21 Jan 2002 07:37:49 +0000 Subject: 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 --- globals.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'globals.h') diff --git a/globals.h b/globals.h index 94b37fd91f..cff4aea57d 100644 --- a/globals.h +++ b/globals.h @@ -1,7 +1,7 @@ /* globals.h * Global defines, etc. * - * $Id: globals.h,v 1.27 2002/01/10 11:05:48 guy Exp $ + * $Id: globals.h,v 1.28 2002/01/21 07:36:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -27,7 +27,7 @@ #include #include "file.h" -#include "timestamp.h" +#include #define MIN_PACKET_SIZE 68 /* minimum amount of packet data we can read */ -- cgit v1.2.1