diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-12-04 19:39:09 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-12-04 19:39:09 +0000 |
| commit | f43601180cf39bcdb635a6deb2e6e7e271bde7a0 (patch) | |
| tree | 4b3f1e54aacb5f529cb4962714b92e4f398ececb | |
| parent | 0fa29bb1eab696d791e455839405702e8fafaf16 (diff) | |
| download | wireshark-f43601180cf39bcdb635a6deb2e6e7e271bde7a0.tar.gz | |
Only define oid_get_default_mib_path() if we have libsmi.
Explicitly mark it as having no arguments.
svn path=/trunk/; revision=23754
| -rw-r--r-- | epan/oids.c | 4 | ||||
| -rw-r--r-- | epan/oids.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/epan/oids.c b/epan/oids.c index 49b4bc854f..b6f0d00723 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -1036,11 +1036,12 @@ extern void oid_both_from_string(const gchar *oid_str, char** resolved_p, char** *numeric_p = (void*)oid_subid2string(subids,subids_len); } +#ifdef HAVE_LIBSMI /** * Fetch the default OID path. */ extern gchar * -oid_get_default_mib_path() { +oid_get_default_mib_path(void) { GString* path_str; gchar *path_ret; guint i; @@ -1059,6 +1060,7 @@ oid_get_default_mib_path() { g_string_free(path_str, FALSE); return path_ret; } +#endif #ifdef DEBUG_OIDS char* oid_test_a2b(guint32 num_subids, guint32* subids) { diff --git a/epan/oids.h b/epan/oids.h index a0329c3880..0bd7c511a5 100644 --- a/epan/oids.h +++ b/epan/oids.h @@ -153,13 +153,15 @@ extern void oid_add(const char* name, guint oid_len, guint32 *subids); extern void oid_add_from_encoded(const char* name, const guint8 *oid, gint oid_len); extern void oid_add_from_string(const char* name, const gchar *oid_str); +#ifdef HAVE_LIBSMI /** * Fetch the default MIB/PIB path * * @return A string containing the default MIB/PIB path. It must be * g_free()d by the caller. */ -extern gchar *oid_get_default_mib_path(); +extern gchar *oid_get_default_mib_path(void); +#endif extern void oid_add_from_string(const char* name, const gchar *oid_str); |