On 13 April 2010 12:47, Dave Shield <[email protected]> wrote:
> (I'm looking at problems with builds with some of the other
> parameters enabled...)
The attached patch seems to fix the errors running build.bat on Windows
with Visual Studio 2008, and selecting SDK support.
I'm therefore calling for votes as to whether this should be applied
to the two lines currently in release freeze.
(Always assuming that the earlier patch is accepted, of course.
If the consensus is not to apply that one to the older lines of code,
then there's no point in even considering this)
Dave
Index: agent/mibgroup/mibII/interfaces.c
===================================================================
--- agent/mibgroup/mibII/interfaces.c (revision 18469)
+++ agent/mibgroup/mibII/interfaces.c (working copy)
@@ -216,7 +216,7 @@
{IFNUMBER, ASN_INTEGER, RONLY, var_interfaces, 1, {1}},
{IFINDEX, ASN_INTEGER, RONLY, var_ifEntry, 3, {2, 1, 1}},
{IFDESCR, ASN_OCTET_STR, RONLY, var_ifEntry, 3, {2, 1, 2}},
- {IFTYPE, ASN_INTEGER, RONLY, var_ifEntry, 3, {2, 1, 3}},
+ {NETSNMP_IFTYPE, ASN_INTEGER, RONLY, var_ifEntry, 3, {2, 1, 3}},
{IFMTU, ASN_INTEGER, RONLY, var_ifEntry, 3, {2, 1, 4}},
{IFSPEED, ASN_GAUGE, RONLY, var_ifEntry, 3, {2, 1, 5}},
{IFPHYSADDRESS, ASN_OCTET_STR, RONLY, var_ifEntry, 3, {2, 1, 6}},
@@ -581,7 +581,7 @@
cp = if_name;
*var_len = strlen(if_name);
return (u_char *) cp;
- case IFTYPE:
+ case NETSNMP_IFTYPE:
if (if_ptr)
long_return = if_ptr->type;
else
@@ -756,7 +756,7 @@
cp = Name;
*var_len = strlen(cp);
return (u_char *) cp;
- case IFTYPE:
+ case NETSNMP_IFTYPE:
if (if_ptr)
long_return = if_ptr->type;
else {
@@ -1081,7 +1081,7 @@
#endif
*var_len = strlen(cp);
return (u_char *) cp;
- case IFTYPE:
+ case NETSNMP_IFTYPE:
if (if_ptr)
long_return = if_ptr->type;
else {
@@ -1322,7 +1322,7 @@
*var_len = ifstat.ifDescr.o_length;
(void) memcpy(return_buf, ifstat.ifDescr.o_bytes, *var_len);
return (u_char *) return_buf;
- case IFTYPE:
+ case NETSNMP_IFTYPE:
if (if_ptr)
long_return = if_ptr->type;
else
@@ -2484,7 +2484,7 @@
cp = ifmd.ifmd_name;
*var_len = strlen(cp);
return (u_char *) cp;
- case IFTYPE:
+ case NETSNMP_IFTYPE:
if (if_ptr)
long_return = if_ptr->type;
else
@@ -2715,7 +2715,7 @@
case IFDESCR:
*var_len = ifRow.dwDescrLen;
return (u_char *) ifRow.bDescr;
- case IFTYPE:
+ case NETSNMP_IFTYPE:
if (if_ptr)
long_return = if_ptr->type;
else
Index: agent/mibgroup/mibII/interfaces.h
===================================================================
--- agent/mibgroup/mibII/interfaces.h (revision 18469)
+++ agent/mibgroup/mibII/interfaces.h (working copy)
@@ -61,7 +61,7 @@
#define IFNUMBER 0
#define IFINDEX 1
#define IFDESCR 2
-#define IFTYPE 3
+#define NETSNMP_IFTYPE 3
#define IFMTU 4
#define IFSPEED 5
#define IFPHYSADDRESS 6
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Net-snmp-coders mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/net-snmp-coders
