diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2017-09-15 07:35:59 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-09-15 13:07:48 +0000 |
| commit | 7c23f56a4d08f33becca50df67c51d1d5b6793e2 (patch) | |
| tree | 84488fa1274dbe0b6884f20ee27b0a2bbdabeb3b /wsutil | |
| parent | 577671a160285b0252cb4ac85b195e902f85253c (diff) | |
Fix compilation errors when configured --without-plugins and without lua.
filesystem.c: In function ‘init_plugin_pers_dir’:
filesystem.c:1041:5: error: ‘plugin_pers_dir’ undeclared (first use in this function)
plugin_pers_dir = get_persconffile_path(PLUGINS_DIR_NAME, FALSE);
^~~~~~~~~~~~~~~
filesystem.c:1041:5: note: each undeclared identifier is reported only once for each function it appears in
filesystem.c: In function ‘get_plugins_pers_dir’:
filesystem.c:1062:10: error: ‘plugin_pers_dir’ undeclared (first use in this function)
if (!plugin_pers_dir)
^~~~~~~~~~~~~~~
Change-Id: I9ace17da42665d135b9432b1f19970491589e3bf
Reviewed-on: https://code.wireshark.org/review/23545
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/filesystem.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index 2a2c4bab5f..a4e5ff075f 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -1033,7 +1033,6 @@ init_plugin_dir(void) } #endif } -#endif /* HAVE_PLUGINS || HAVE_LUA */ static void init_plugin_pers_dir(void) @@ -1041,6 +1040,8 @@ init_plugin_pers_dir(void) plugin_pers_dir = get_persconffile_path(PLUGINS_DIR_NAME, FALSE); } +#endif /* HAVE_PLUGINS || HAVE_LUA */ + /* * Get the directory in which the plugins are stored. */ @@ -1059,9 +1060,13 @@ get_plugin_dir(void) const char * get_plugins_pers_dir(void) { +#if defined(HAVE_PLUGINS) || defined(HAVE_LUA) if (!plugin_pers_dir) init_plugin_pers_dir(); return plugin_pers_dir; +#else + return NULL; +#endif } #if defined(HAVE_EXTCAP) |