aboutsummaryrefslogtreecommitdiffstats
path: root/epan/filesystem.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-08-21 08:16:54 +0000
committerGuy Harris <guy@alum.mit.edu>2001-08-21 08:16:54 +0000
commit973552df3eee47137c2facffa3e93711a4af1090 (patch)
tree2e034372bde380b400237d8f3da17b26770773a1 /epan/filesystem.c
parentd7973c6ede2e21e9582a956618a2bc308a25e3b9 (diff)
downloadwireshark-973552df3eee47137c2facffa3e93711a4af1090.tar.gz
wireshark-973552df3eee47137c2facffa3e93711a4af1090.tar.bz2
wireshark-973552df3eee47137c2facffa3e93711a4af1090.zip
Fix some Win32 compilation warnings and errors.
svn path=/trunk/; revision=3861
Diffstat (limited to 'epan/filesystem.c')
-rw-r--r--epan/filesystem.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c
index c026c2d681..273cf8f164 100644
--- a/epan/filesystem.c
+++ b/epan/filesystem.c
@@ -1,7 +1,7 @@
/* filesystem.c
* Filesystem utility routines
*
- * $Id: filesystem.c,v 1.5 2001/08/21 06:39:16 guy Exp $
+ * $Id: filesystem.c,v 1.6 2001/08/21 08:16:54 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -44,6 +44,10 @@
#include <sys/stat.h>
#endif
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
#ifndef WIN32
#include <pwd.h>
#endif
@@ -255,6 +259,7 @@ get_datafile_dir(void)
datafile_dir[datafile_dir_len] = '\0';
}
}
+ return datafile_dir;
#else
/*
* Just use DATAFILE_DIR, as that's what the configure script