X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=userapps%2Fopensource%2Fnet-snmp%2Fagent%2Fmibgroup%2FmibII%2Fsystem_mib.c;h=8b1c9045e14a0611e50d1f5e5d49cee67e1af82a;hp=eb80c78b47fd9bd8dbe2374636b45fafaba504f1;hb=6adeba4d92a546ebbadde2562283ee6b984b22c1;hpb=dacd86d83a9fb430cca42cb78a67f9d46e289f5c

diff --git a/userapps/opensource/net-snmp/agent/mibgroup/mibII/system_mib.c b/userapps/opensource/net-snmp/agent/mibgroup/mibII/system_mib.c
index eb80c78b..8b1c9045 100755
--- a/userapps/opensource/net-snmp/agent/mibgroup/mibII/system_mib.c
+++ b/userapps/opensource/net-snmp/agent/mibgroup/mibII/system_mib.c
@@ -53,7 +53,7 @@
 #include "system_mib.h"
 #include "struct.h"
 
-#ifdef BUILD_SNMP_SYSOR_MIB
+#ifdef SNMP_SYSOR_MIB
 #include "sysORTable.h"
 #endif
 
@@ -295,7 +295,7 @@ struct variable1 system_variables[] = {
     {VERSION_DESCR, ASN_OCTET_STR, RONLY, var_system, 1, {1}},
     {VERSIONID, ASN_OBJECT_ID, RONLY, var_system, 1, {2}},
     {UPTIME, ASN_TIMETICKS, RONLY, var_system, 1, {3}},
-#ifdef BUILD_SNMP_SET
+#ifdef SNMP_SET
     {SYSCONTACT, ASN_OCTET_STR, RWRITE, var_system, 1, {4}},
     {SYSTEMNAME, ASN_OCTET_STR, RWRITE, var_system, 1, {5}},
     {SYSLOCATION, ASN_OCTET_STR, RWRITE, var_system, 1, {6}},
@@ -303,8 +303,8 @@ struct variable1 system_variables[] = {
     {SYSCONTACT, ASN_OCTET_STR, RONLY, var_system, 1, {4}},
     {SYSTEMNAME, ASN_OCTET_STR, RONLY, var_system, 1, {5}},
     {SYSLOCATION, ASN_OCTET_STR, RONLY, var_system, 1, {6}},
-#endif /* BUILD_SNMP_SET */
-#ifdef BUILD_SNMP_SYSOR_MIB
+#endif /* SNMP_SET */
+#ifdef SNMP_SYSOR_MIB
     {SYSSERVICES, ASN_INTEGER, RONLY, var_system, 1, {7}},
     {SYSORLASTCHANGE, ASN_TIMETICKS, RONLY, var_system, 1, {8}}
 #else
@@ -429,7 +429,7 @@ init_system_mib(void)
     REGISTER_MIB("mibII/system", system_variables, variable1,
                  system_variables_oid);
 
-#ifdef BUILD_SNMP_SYSOR_MIB
+#ifdef SNMP_SYSOR_MIB
     if (++system_module_count == 3)
         REGISTER_SYSOR_ENTRY(system_module_oid,
                              "The MIB module for SNMPv2 entities");
@@ -476,11 +476,11 @@ init_system_mib(void)
 	 *
 	 *********************/
 
-#ifdef BUILD_SNMP_SYSOR_MIB
+#ifdef SNMP_SYSOR_MIB
 #ifdef USING_MIBII_SYSORTABLE_MODULE
 extern struct timeval sysOR_lastchange;
 #endif
-#endif /* BUILD_SNMP_SYSOR_MIB */
+#endif /* SNMP_SYSOR_MIB */
 
 u_char         *
 var_system(struct variable *vp,
@@ -506,7 +506,7 @@ var_system(struct variable *vp,
         return ((u_char *) & ulret);
     case SYSCONTACT:
         *var_len = strlen(sysContact);
-#ifdef BUILD_SNMP_SET
+#ifdef SNMP_SET
         *write_method = writeSystem;
 #else
         *write_method = NULL;
@@ -514,7 +514,7 @@ var_system(struct variable *vp,
         return (u_char *) sysContact;
     case SYSTEMNAME:
         *var_len = strlen(sysName);
-#ifdef BUILD_SNMP_SET
+#ifdef SNMP_SET
         *write_method = writeSystem;
 #else
         *write_method = NULL;
@@ -522,7 +522,7 @@ var_system(struct variable *vp,
         return (u_char *) sysName;
     case SYSLOCATION:
         *var_len = strlen(sysLocation);
-#ifdef BUILD_SNMP_SET
+#ifdef SNMP_SET
         *write_method = writeSystem;
 #else
         *write_method = NULL;
@@ -536,13 +536,13 @@ var_system(struct variable *vp,
         long_return = sysServices;
         return (u_char *) & long_return;
 
-#ifdef BUILD_SNMP_SYSOR_MIB
+#ifdef SNMP_SYSOR_MIB
 #ifdef USING_MIBII_SYSORTABLE_MODULE
     case SYSORLASTCHANGE:
         ulret = netsnmp_timeval_uptime(&sysOR_lastchange);
         return ((u_char *) & ulret);
 #endif
-#endif /* BUILD_SNMP_SYSOR_MIB */
+#endif /* SNMP_SYSOR_MIB */
     default:
         DEBUGMSGTL(("snmpd", "unknown sub-id %d in var_system\n",
                     vp->magic));
@@ -551,7 +551,7 @@ var_system(struct variable *vp,
 }
 
 
-#ifdef BUILD_SNMP_SET
+#ifdef SNMP_SET
 int
 writeSystem(int action,
             u_char * var_val,
@@ -652,7 +652,7 @@ writeSystem(int action,
     }
     return SNMP_ERR_NOERROR;
 }                               /* end of writeSystem */
-#endif /* BUILD_SNMP_SET */
+#endif /* SNMP_SET */
 
         /*********************
 	 *