From Gisle Vanem: undefine OPAQUE, as it's defined by <wingdi.h>, which

is included if we compile with at least some Windows compilers, and
add a default case to "smi_check_a_range()".

diff --git a/print-snmp.c b/print-snmp.c
index ad3a0efd268e919e49d13eb81b718423e71d3a50..7b1f5b6f3b68891fb3f00c29382b53d9e2e101ef 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -58,7 +58,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.59 2004-03-23 06:59:15 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.60 2004-11-04 07:53:56 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -77,6 +77,8 @@ static const char rcsid[] _U_ =
 #include "interface.h"
 #include "addrtoname.h"
 
+#undef OPAQUE  /* defined in <wingdi.h> */
+
 /*
  * Universal ASN.1 types
  * (we only care about the tag values for those allowed in the Internet SMI)
@@ -949,6 +951,10 @@ static int smi_check_a_range(SmiType *smiType, SmiRange *smiRange,
     case SMI_BASETYPE_UNKNOWN:
        ok = 1;
        break;
+
+    default:
+       ok = 0;
+       break;
     }
 
     return ok;