diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-03-10 23:19:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-03-10 23:19:44 +0000 |
| commit | 37dd5f340ccfc409b97a61a2808ccf7ff8922641 (patch) | |
| tree | dd794deb2f125341ac6b00437fe6856c51c64a55 /tethereal.c | |
| parent | bdbb5670876b2aeafe7277fdd43576906fd26aa4 (diff) | |
| download | wireshark-37dd5f340ccfc409b97a61a2808ccf7ff8922641.tar.gz wireshark-37dd5f340ccfc409b97a61a2808ccf7ff8922641.tar.bz2 wireshark-37dd5f340ccfc409b97a61a2808ccf7ff8922641.zip | |
Remove code to show the presence, and version number, of the CMU SNMP
library, as we no longer support linking with that library.
svn path=/trunk/; revision=4917
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tethereal.c b/tethereal.c index 5951e4cb86..8f8326bc38 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.130 2002/03/06 23:37:07 guy Exp $ + * $Id: tethereal.c,v 1.131 2002/03/10 23:19:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -72,11 +72,7 @@ #ifdef HAVE_UCD_SNMP_VERSION_H #include <ucd-snmp/version.h> #endif /* HAVE_UCD_SNMP_VERSION_H */ -#elif defined(HAVE_SNMP_SNMP_H) -#ifdef HAVE_SNMP_VERSION_H -#include <snmp/version.h> -#endif /* HAVE_SNMP_VERSION_H */ -#endif /* SNMP */ +#endif /* HAVE_UCD_SNMP_SNMP_H */ #ifdef NEED_STRERROR_H #include "strerror.h" @@ -429,14 +425,7 @@ main(int argc, char *argv[]) #else /* HAVE_UCD_SNMP_VERSION_H */ g_string_append(comp_info_str, "(version unknown)"); #endif /* HAVE_UCD_SNMP_VERSION_H */ -#elif defined(HAVE_SNMP_SNMP_H) - g_string_append(comp_info_str, ", with CMU SNMP "); -#ifdef HAVE_SNMP_VERSION_H - g_string_append(comp_info_str, snmp_Version()); -#else /* HAVE_SNMP_VERSION_H */ - g_string_append(comp_info_str, "(version unknown)"); -#endif /* HAVE_SNMP_VERSION_H */ -#else /* no SNMP */ +#else /* no SNMP library */ g_string_append(comp_info_str, ", without SNMP MIB support"); #endif |