summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-08-12 20:01:30 +0000
committerGuy Harris <guy@alum.mit.edu>2013-08-12 20:01:30 +0000
commitbebe1200ded4978ab25e42be368ab89552e79294 (patch)
treef8320615f7a14663e1e47dc2958cb2f8e6716511 /epan
parent4b641014a28ad66bc10596b75e8862799ced6a49 (diff)
downloadwireshark-bebe1200ded4978ab25e42be368ab89552e79294.tar.gz
Just check whether dladdr() is available; we check in the code whether
it succeeds, so there's no point in checking whether it succeeds in a sample program. svn path=/trunk/; revision=51322
Diffstat (limited to 'epan')
-rw-r--r--epan/filesystem.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c
index ef0970e4c4..3ff5ad1fc8 100644
--- a/epan/filesystem.c
+++ b/epan/filesystem.c
@@ -71,7 +71,7 @@
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
-#ifdef DLADDR_FINDS_EXECUTABLE_PATH
+#ifdef HAVE_DLADDR
#include <dlfcn.h>
#endif
#include <pwd.h>
@@ -441,7 +441,7 @@ init_progfile_dir(const char *arg0
_U_
#endif
, int (*main_addr)(int, char **)
-#if defined(_WIN32) || !defined(DLADDR_FINDS_EXECUTABLE_PATH)
+#if defined(_WIN32) || !defined(HAVE_DLADDR)
_U_
#endif
)
@@ -507,7 +507,7 @@ init_progfile_dir(const char *arg0
msg, error);
}
#else
-#ifdef DLADDR_FINDS_EXECUTABLE_PATH
+#ifdef HAVE_DLADDR
Dl_info info;
#endif
const char *execname;
@@ -535,7 +535,7 @@ init_progfile_dir(const char *arg0
running_in_build_directory_flag = TRUE;
execname = get_executable_path();
-#ifdef DLADDR_FINDS_EXECUTABLE_PATH
+#ifdef HAVE_DLADDR
if (execname == NULL) {
/*
* Try to use dladdr() to find the pathname of the executable.