diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-06 07:24:22 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-06 07:24:22 +0000 |
| commit | 500018d4f696d275b533df83d348566f4a47dc77 (patch) | |
| tree | 77a45df6bb2090e626e4ab375baafde39e31f28f /epan/oids.c | |
| parent | a22526df745aab1122069df5ad2c7b65db082bec (diff) | |
| download | wireshark-500018d4f696d275b533df83d348566f4a47dc77.tar.gz | |
Fix compilation of epan/oids.c without HAVE_LIBSMI
svn path=/trunk/; revision=43583
Diffstat (limited to 'epan/oids.c')
| -rw-r--r-- | epan/oids.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/epan/oids.c b/epan/oids.c index 561b1e4732..058174b3a7 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -720,6 +720,7 @@ static void register_mibs(void) { void oid_pref_init(module_t *nameres) { +#ifdef HAVE_LIBSMI static uat_field_t smi_fields[] = { UAT_FLD_CSTRING(smi_mod,name,"Module name","The module's name"), UAT_END_FIELDS @@ -729,7 +730,6 @@ void oid_pref_init(module_t *nameres) UAT_END_FIELDS }; -#ifdef HAVE_LIBSMI prefs_register_bool_preference(nameres, "load_smi_modules", "Enable OID resolution", "You must restart Wireshark for this change to take effect", @@ -798,23 +798,19 @@ void oid_pref_init(module_t *nameres) } void oids_init(void) { - if (load_smi_modules) { #ifdef HAVE_LIBSMI register_mibs(); #else D(1,("libsmi disabled oid resolution not enabled")); #endif - } } void oids_cleanup(void) { - if (load_smi_modules) { #ifdef HAVE_LIBSMI - unregister_mibs(); + unregister_mibs(); #else - D(1,("libsmi disabled oid resolution not enabled")); + D(1,("libsmi disabled oid resolution not enabled")); #endif - } } const char* oid_subid2string(guint32* subids, guint len) { |