From e980dd9d3bfe00047bc454a2a68d590c2deb37ea Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 21 Oct 2001 21:48:00 +0000
Subject: 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
---
 epan/epan.h | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'epan/epan.h')

diff --git a/epan/epan.h b/epan/epan.h
index a2d97585f8..a45387ffc5 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -1,6 +1,6 @@
 /* epan.h
  *
- * $Id: epan.h,v 1.6 2001/04/02 00:38:34 hagbard Exp $
+ * $Id: epan.h,v 1.7 2001/10/21 21:47:58 guy Exp $
  *
  * Ethereal Protocol Analyzer Library
  *
@@ -56,15 +56,4 @@ epan_dissect_new(void* pseudo_header, const guint8* data, frame_data *fd, proto_
 void
 epan_dissect_free(epan_dissect_t* edt);
 
-
-
-
-
-/* Should this be ".libepan"? For backwards-compatibility, I'll keep
- * it ".ethereal" for now.
- */
-#define PF_DIR ".ethereal"
-
-
-
 #endif /* EPAN_H */
-- 
cgit v1.2.3