more SNMP compiler cleanup, typedefs, etc

diff --git a/include/snmp_vars.h b/include/snmp_vars.h
index 7ff8e55fcb47bc1807a97dc03e943fb07ac0837b..fab8622073c54c5187e0a305f83c92e4e53cf8dd 100644 (file)
--- a/include/snmp_vars.h
+++ b/include/snmp_vars.h
@@ -271,13 +271,16 @@ struct inpcb {
 extern void TCP_Scan_Init();
 extern int TCP_Scan_Next();
 
+typedef struct variable variable;
+typedef int SNMPWM(int, u_char *, u_char, int, u_char *, oid *, int);
+typedef u_char *SNMPFV(variable *, oid *, int *, int, int *, SNMPWM **);
 
 struct variable {
     u_char magic;              /* passed to function as a hint */
     char type;                 /* type of variable */
 /* See important comment in snmp_vars.c relating to acl */
     u_short acl;               /* access control list for variable */
-    u_char *(*findVar) ();     /* function that finds variable */
+    SNMPFV *findVar;           /* function that finds variable */
     u_char namelen;            /* length of above */
     oid name[32];              /* object identifier of variable */
 };

diff --git a/src/Makefile.in b/src/Makefile.in
index 94054e1a662cbdd3d2892fe9f92ef7a65136531c..82ce873074fba7919f22edecfe8032dffaa14b6e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.98 1997/11/21 00:47:54 wessels Exp $
+#  $Id: Makefile.in,v 1.99 1997/11/21 04:45:34 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -129,6 +129,7 @@ OBJS                = \
                redirect.o \
                refresh.o \
                send-announce.o \
+               $(SNMP_OBJS) \
                ssl.o \
                stack.o \
                stat.o \
@@ -144,7 +145,6 @@ OBJS                = \
                url.o \
                useragent.o \
                wais.o \
-               $(SNMP_OBJS) \
                $(XTRA_OBJS)
 
 SNMP_OBJS      = \