diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-23 18:24:09 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-23 18:24:09 +0000 |
| commit | 97a6fe55e819a78f2d0b114c1e0feb3ea128b219 (patch) | |
| tree | aa6a14e465bfd44622f7a332997d0dcb77cdc093 /packet-snmp.c | |
| parent | c419448cc7b655103f679b6c2753d36557c54318 (diff) | |
From Wes Hardaker:
Define HAVE_SOME_SNMP if either HAVE_UCD_SNMP or HAVE_NET_SNMP
is defined, and use HAVE_SOME_SNMP, rather than HAVE_UCD_SNMP,
in most places when testing whether we have an SNMP library or
not.
Be more selective when including Net-SNMP header files.
Fix up {gtk,gtk2}/main.c to do the same SNMP stuff that tethereal.c
does - including the MIB stuff that gtk/main.c was doing but gtk2/main.c
wasn't doing.
Fix the copyright date in gtk/main.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6483 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-snmp.c')
| -rw-r--r-- | packet-snmp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packet-snmp.c b/packet-snmp.c index d9b1ea5029..0fe1b496ad 100644 --- a/packet-snmp.c +++ b/packet-snmp.c @@ -10,7 +10,7 @@ * * See RFCs 2570-2576 for SNMPv3 * - * $Id: packet-snmp.c,v 1.97 2002/10/22 20:06:15 jmayer Exp $ + * $Id: packet-snmp.c,v 1.98 2002/10/23 18:24:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -53,11 +53,10 @@ #include "etypes.h" #include "packet-ipx.h" -#if defined(HAVE_UCD_SNMP) || defined(HAVE_NET_SNMP) -#define HAVE_SOME_SNMP #ifdef HAVE_NET_SNMP # include <net-snmp/net-snmp-config.h> -# include <net-snmp/net-snmp-includes.h> +# include <net-snmp/mib_api.h> +# include <net-snmp/library/default_store.h> #else # include <ucd-snmp/ucd-snmp-config.h> # include <ucd-snmp/asn1.h> @@ -73,6 +72,8 @@ # define NETSNMP_DS_LIB_NO_TOKEN_WARNINGS DS_LIB_NO_TOKEN_WARNINGS # define NETSNMP_DS_LIB_PRINT_SUFFIX_ONLY DS_LIB_PRINT_SUFFIX_ONLY #endif + +#ifdef HAVE_SOME_SNMP /* * Define values "sprint_realloc_value()" expects. */ |