diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-25 03:13:11 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-25 03:13:11 +0000 |
commit | e1caa1c69df2144a92d442ce9733b8bfd3497c71 (patch) | |
tree | cdb01a0e0ce38c4661015c5aa4a752da2a38aa89 /gtk2 | |
parent | 66695f75a936f102b127b4fb3741f42a7497ef17 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6503 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk2')
-rw-r--r-- | gtk2/main.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gtk2/main.c b/gtk2/main.c index 431b370301..96f8a1d9bd 100644 --- a/gtk2/main.c +++ b/gtk2/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.18 2002/10/25 01:08:48 guy Exp $ + * $Id: main.c,v 1.19 2002/10/25 03:13:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -65,17 +65,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 @@ -1540,11 +1538,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 |