diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-10-25 03:13:11 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-10-25 03:13:11 +0000 |
| commit | 72d59f05969e83dca408cfbc20daaec83940a37e (patch) | |
| tree | cdb01a0e0ce38c4661015c5aa4a752da2a38aa89 /tethereal.c | |
| parent | 00b3eed0338f0d1e00dceb43d2dd2ad635b96fb9 (diff) | |
The versions of UCD SNMP that we now support all install
<ucd-snmp/version.h>, so get rid of the stuff to check for its presence
and handle its absence.
svn path=/trunk/; revision=6503
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/tethereal.c b/tethereal.c index 8bc1f4cda4..97f9a61be9 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.164 2002/10/24 07:08:22 guy Exp $ + * $Id: tethereal.c,v 1.165 2002/10/25 03:13:07 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -61,17 +61,15 @@ #endif #ifdef HAVE_SOME_SNMP + #ifdef HAVE_NET_SNMP #include <net-snmp/version.h> -#else /* HAVE_NET_SNMP */ -/* - * XXX - we no longer support old versions of UCD SNMP; do all the - * versions we support have, and install, this header? - */ -#ifdef HAVE_UCD_SNMP_VERSION_H -#include <ucd-snmp/version.h> -#endif /* HAVE_UCD_SNMP_VERSION_H */ #endif /* HAVE_NET_SNMP */ + +#ifdef HAVE_UCD_SNMP +#include <ucd-snmp/version.h> +#endif /* HAVE_UCD_SNMP */ + #endif /* HAVE_SOME_SNMP */ #ifdef NEED_STRERROR_H @@ -449,11 +447,7 @@ main(int argc, char *argv[]) #ifdef HAVE_UCD_SNMP g_string_append(comp_info_str, ", with UCD-SNMP "); -#ifdef HAVE_UCD_SNMP_VERSION_H g_string_append(comp_info_str, VersionInfo); -#else /* HAVE_UCD_SNMP_VERSION_H */ - g_string_append(comp_info_str, "(version unknown)"); -#endif /* HAVE_UCD_SNMP_VERSION_H */ #endif /* HAVE_UCD_SNMP */ #ifdef HAVE_NET_SNMP |