From: hno <>
Date: Sat, 1 Mar 2003 18:04:45 +0000 (+0000)
Subject: Bug #199: sync redeclarations when compiling support for ARP acls
X-Git-Tag: SQUID_3_0_PRE1~305
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fc1da74fdb56eb2f42bca88210754a033835087;p=thirdparty%2Fsquid.git

Bug #199: sync redeclarations when compiling support for ARP acls
---

diff --git a/src/ACLARP.cc b/src/ACLARP.cc
index fa00955749..3327c55272 100644
--- a/src/ACLARP.cc
+++ b/src/ACLARP.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLARP.cc,v 1.1 2003/02/25 12:16:55 robertc Exp $
+ * $Id: ACLARP.cc,v 1.2 2003/03/01 11:04:45 hno Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -34,6 +34,25 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
+#include "config.h"
+
+#ifdef _SQUID_SOLARIS_
+#include <sys/sockio.h>
+#else
+#include <sys/sysctl.h>
+#endif
+#ifdef _SQUID_LINUX_
+#include <net/if_arp.h>
+#include <sys/ioctl.h>
+#else
+#include <net/if_dl.h>
+#endif
+#include <net/route.h>
+#include <net/if.h>
+#if HAVE_NETINET_IF_ETHER_H
+#include <netinet/if_ether.h>
+#endif
+
 #include "squid.h"
 #include "ACLARP.h"
 
@@ -134,23 +153,6 @@ ACLARP::valid () const
  *       Solaris code by R. Gancarz <radekg@solaris.elektrownia-lagisza.com.pl>
  */
 
-#ifdef _SQUID_SOLARIS_
-#include <sys/sockio.h>
-#else
-#include <sys/sysctl.h>
-#endif
-#ifdef _SQUID_LINUX_
-#include <net/if_arp.h>
-#include <sys/ioctl.h>
-#else
-#include <net/if_dl.h>
-#endif
-#include <net/route.h>
-#include <net/if.h>
-#if HAVE_NETINET_IF_ETHER_H
-#include <netinet/if_ether.h>
-#endif
-
 /*
  * Decode an ascii representation (asc) of an ethernet adress, and place
  * it in eth[6].