argus-clients-3.0.0.rc.6.tar.gz and FreeBSD 4.10

[Peter Van Epp]

	The following patches make argus-clients-3.0.0.rc.6.tar.gz compile 
(with some warnings because it doesn't understand ifndef) on FreeBSD 4.10 and
still on FreeBSD 6.1. If they don't break anything else perhaps they can be
included leaving only Mac OS 10.3 as a problem.
	These are against argus-clients-3.0.0.rc.6.tar.gz:

(The compiler doesn't seem to like a definition after the code block starts
 although I think that is valid C)

*** common/argus_client.c.orig	Wed Jun 14 15:44:31 2006
--- common/argus_client.c	Wed Jun 14 16:44:31 2006
***************
*** 1668,1673 ****
--- 1668,1674 ----
     unsigned int *dsrptr = (unsigned int *)retn + 1;
     int i, x, len = 0, type = 0;
     struct ArgusDSRHeader *dsr;
+    struct ArgusFlow           *tflow = NULL;
  
     if (rec) {
        retn->hdr.type  = rec->hdr.type;
***************
*** 1676,1682 ****
        
        if (rec->hdr.type & ARGUS_FAR) {
           dsrindex = rec->dsrindex;
-          struct ArgusFlow           *tflow = NULL;
           for (i = 0, ind = 1; (dsrindex && (i < ARGUSMAXDSRTYPE)); i++, ind <<= 1) {
              if ((dsr = rec->dsrs[i]) != NULL) {
                 len = ((dsr->type & ARGUS_IMMEDIATE_DATA) ? 1 :
--- 1677,1682 ----


*** include/argus_os.h.orig	Wed Jun 14 14:57:14 2006
--- include/argus_os.h	Wed Jun 14 14:58:05 2006
***************
*** 96,103 ****
  #endif
  
  
- #include <netinet/in.h>
  #include <sys/types.h>
  #include <netinet/icmp6.h>
  
  #ifndef ICMP6_MEMBERSHIP_QUERY
--- 96,103 ----
  #endif
  
  
  #include <sys/types.h>
+ #include <netinet/in.h>
  #include <netinet/icmp6.h>
  
  #ifndef ICMP6_MEMBERSHIP_QUERY

*** common/scanner.l.orig	Thu Jun  8 11:20:12 2006
--- common/scanner.l	Wed Jun 14 14:59:48 2006
***************
*** 65,71 ****
--- 65,73 ----
  #include <tokdefs.h>
  #include <syslog.h>
  
+ #if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
  float strtof(const char *, char ** );
+ #endif
  extern void ArgusLog (int, char *, ...);
  
  #ifndef __GNUC__