diff options
| -rw-r--r-- | gtk/Makefile.nmake | 5 | ||||
| -rw-r--r-- | gtk/main.c | 12 | ||||
| -rw-r--r-- | gtk2/Makefile.nmake | 5 | ||||
| -rw-r--r-- | gtk2/main.c | 12 | ||||
| -rw-r--r-- | packet-snmp.c | 11 | ||||
| -rw-r--r-- | tethereal.c | 12 |
6 files changed, 45 insertions, 12 deletions
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index a834050e85..4edefe0e00 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.31 2002/09/23 17:07:39 jmayer Exp $ +# $Id: Makefile.nmake,v 1.32 2002/10/24 07:08:24 guy Exp $ include ..\config.nmake @@ -13,7 +13,8 @@ CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \ /I$(ZLIB_DIR) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ - /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) + /I$(PCAP_DIR)\include /I$(NET_SNMP_DIR)\include \ + /I$(NET_SNMP_DIR)\win32 -D_U_="" $(LOCAL_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL diff --git a/gtk/main.c b/gtk/main.c index d1d5a1663c..c4f059bc92 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.267 2002/10/23 18:24:07 guy Exp $ + * $Id: main.c,v 1.268 2002/10/24 07:08:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -60,9 +60,19 @@ # include "snprintf.h" #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 */ +#endif /* HAVE_SOME_SNMP */ #ifdef NEED_STRERROR_H #include "strerror.h" diff --git a/gtk2/Makefile.nmake b/gtk2/Makefile.nmake index 3f17200cdf..88ff38da2d 100644 --- a/gtk2/Makefile.nmake +++ b/gtk2/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.7 2002/09/23 15:00:39 jmayer Exp $ +# $Id: Makefile.nmake,v 1.8 2002/10/24 07:08:26 guy Exp $ include ..\config.nmake @@ -13,7 +13,8 @@ CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \ /I$(ZLIB_DIR) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ - /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) + /I$(PCAP_DIR)\include /I$(NET_SNMP_DIR)\include \ + /I$(NET_SNMP_DIR)\win32 -D_U_="" $(LOCAL_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL diff --git a/gtk2/main.c b/gtk2/main.c index 6c9a2095ac..5ba3feabc4 100644 --- a/gtk2/main.c +++ b/gtk2/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.15 2002/10/23 18:24:09 guy Exp $ + * $Id: main.c,v 1.16 2002/10/24 07:08:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -60,9 +60,19 @@ # include "snprintf.h" #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 */ +#endif /* HAVE_SOME_SNMP */ #ifdef NEED_STRERROR_H #include "strerror.h" diff --git a/packet-snmp.c b/packet-snmp.c index 125ae98e7b..a8bcf0ebaf 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.99 2002/10/24 06:39:09 tpot Exp $ + * $Id: packet-snmp.c,v 1.100 2002/10/24 07:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -53,11 +53,13 @@ #include "etypes.h" #include "packet-ipx.h" +#ifdef HAVE_SOME_SNMP #ifdef HAVE_NET_SNMP # include <net-snmp/net-snmp-config.h> # include <net-snmp/mib_api.h> # include <net-snmp/library/default_store.h> -#elif defined(HAVE_UCD_SNMP) +# include <net-snmp/config_api.h> +#else /* HAVE_NET_SNMP */ # include <ucd-snmp/ucd-snmp-config.h> # include <ucd-snmp/asn1.h> # include <ucd-snmp/snmp_api.h> @@ -71,9 +73,8 @@ # define NETSNMP_DS_LIBRARY_ID DS_LIBRARY_ID # 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 +#endif /* HAVE_NET_SNMP */ -#ifdef HAVE_SOME_SNMP /* * Define values "sprint_realloc_value()" expects. */ @@ -89,7 +90,7 @@ # define VALTYPE_BITSTR ASN_BIT_STR # define VALTYPE_COUNTER64 ASN_COUNTER64 -#endif +#endif /* HAVE_SOME_SNMP */ #include "asn1.h" diff --git a/tethereal.c b/tethereal.c index 4a7a75eb54..8bc1f4cda4 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.163 2002/10/23 18:24:04 guy Exp $ + * $Id: tethereal.c,v 1.164 2002/10/24 07:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -60,9 +60,19 @@ # include "snprintf.h" #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 */ +#endif /* HAVE_SOME_SNMP */ #ifdef NEED_STRERROR_H #include "strerror.h" |