diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-12 02:29:17 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-12 02:29:17 +0000 |
| commit | 1f2043d69c8e4458e6abdbc00d171db3adbf57e5 (patch) | |
| tree | f35704858446f0a0e9dbe09d1b2eefd984b83124 /epan/filesystem.c | |
| parent | 6a5afa8e958450f1606d45e60956529c79dded64 (diff) | |
| download | wireshark-1f2043d69c8e4458e6abdbc00d171db3adbf57e5.tar.gz | |
Solaris Studio C++ won't let us pass the address of main() to
init_progfile_dir(). Try using QCoreApplication::applicationFilePath()
instead.
svn path=/trunk/; revision=52559
Diffstat (limited to 'epan/filesystem.c')
| -rw-r--r-- | epan/filesystem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c index dd5b308bee..e5fc395fe3 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -582,7 +582,7 @@ init_progfile_dir(const char *arg0 execname = get_executable_path(); #ifdef HAVE_DLADDR - if (execname == NULL) { + if (main_addr != NULL && execname == NULL) { /* * Try to use dladdr() to find the pathname of the executable. * dladdr() is not guaranteed to give you anything better than |