diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-10-21 21:48:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-10-21 21:48:00 +0000 |
| commit | e980dd9d3bfe00047bc454a2a68d590c2deb37ea (patch) | |
| tree | 63b6b1f2a27db0a1dcf8e986ed3441c7c3a0a274 /gtk | |
| parent | fa928f62c3b9bf3bd69c6e83747f954d7ba1c7ea (diff) | |
| download | wireshark-e980dd9d3bfe00047bc454a2a68d590c2deb37ea.tar.gz wireshark-e980dd9d3bfe00047bc454a2a68d590c2deb37ea.tar.bz2 wireshark-e980dd9d3bfe00047bc454a2a68d590c2deb37ea.zip | |
Use G_DIR_SEPARATOR_S rather than "/" as a pathname separator in format
strings used to generate pathnames.
Move the definition of PF_DIR from <epan/epan.h> to <epan/filesystem.h>,
so that files requiring only the definition of PF_DIR don't have to
include <epan/epan.h>, and get rid of no-longer-necessary includes of
<epan/epan.h>.
Add a routine to get the directory for "system files" such as
"/etc/ethers" - it's "/etc" on UNIX, and the datafile directory on
Windows (as there's no "/etc" on Windows). Use that to construct the
pathname of the ethers and ipxnet files.
svn path=/trunk/; revision=4056
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/colors.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/colors.c b/gtk/colors.c index 0b9c04e47c..4103816be3 100644 --- a/gtk/colors.c +++ b/gtk/colors.c @@ -1,12 +1,11 @@ /* colors.c * Definitions for color structures and routines * - * $Id: colors.c,v 1.9 2001/04/24 00:28:21 guy Exp $ + * $Id: colors.c,v 1.10 2001/10/21 21:48:00 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 @@ -39,7 +38,6 @@ #include <sys/types.h> #endif -#include <epan.h> #include <epan/filesystem.h> #include "gtk/main.h" #include "packet.h" |