--------------------- PatchSet 6891 Date: 2008/02/19 10:27:14 Author: amosjeffries Branch: cleanup Tag: (none) Log: Fix missing header dependencies. Members: include/GNUregex.h:1.2->1.2.52.1 include/IPAddress.h:1.4->1.4.2.1 include/asn1.h:1.1->1.1.74.1 include/hash.h:1.2->1.2.72.1 include/heap.h:1.1->1.1.74.1 include/inet_ntop.h:1.2->1.2.12.1 include/inet_pton.h:1.2->1.2.12.1 include/initgroups.h:1.2->1.2.50.1 Index: squid3/include/GNUregex.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/GNUregex.h,v retrieving revision 1.2 retrieving revision 1.2.52.1 diff -u -r1.2 -r1.2.52.1 --- squid3/include/GNUregex.h 4 Aug 2003 02:12:46 -0000 1.2 +++ squid3/include/GNUregex.h 19 Feb 2008 10:27:14 -0000 1.2.52.1 @@ -1,10 +1,12 @@ /* - * $Id: GNUregex.h,v 1.2 2003/08/04 02:12:46 squidadm Exp $ + * $Id: GNUregex.h,v 1.2.52.1 2008/02/19 10:27:14 amosjeffries Exp $ */ - #ifndef SQUID_REGEXP_LIBRARY_H #define SQUID_REGEXP_LIBRARY_H +/* Squid auto-conf definitions */ +#include "config.h" + /* Definitions for data structures and routines for the regular * expression library, version 0.12. * Index: squid3/include/IPAddress.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/IPAddress.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- squid3/include/IPAddress.h 5 Feb 2008 22:51:15 -0000 1.4 +++ squid3/include/IPAddress.h 19 Feb 2008 10:27:14 -0000 1.4.2.1 @@ -1,5 +1,5 @@ /* - * $Id: IPAddress.h,v 1.4 2008/02/05 22:51:15 squidadm Exp $ + * $Id: IPAddress.h,v 1.4.2.1 2008/02/19 10:27:14 amosjeffries Exp $ * * DEBUG: section 14 IP Storage and Handling * AUTHOR: Amos Jeffries @@ -35,10 +35,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ - #ifndef _INC_IPADDRESS_H #define _INC_IPADDRESS_H +#include "getaddrinfo.h" +#include "getnameinfo.h" +#include "inet_ntop.h" +#include "inet_pton.h" + + #if HAVE_SYS_SOCKET_H #include #endif @@ -56,14 +61,9 @@ #include #endif - #include #include -#include "getaddrinfo.h" -#include "getnameinfo.h" -#include "inet_ntop.h" -#include "inet_pton.h" /* FreeBSD hack: * This OS has at least one version that defines these as private @@ -402,6 +402,7 @@ #endif }; + inline std::ostream & operator << (std::ostream &os, const IPAddress &ipa) { Index: squid3/include/asn1.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/asn1.h,v retrieving revision 1.1 retrieving revision 1.1.74.1 diff -u -r1.1 -r1.1.74.1 --- squid3/include/asn1.h 14 Oct 2002 00:18:18 -0000 1.1 +++ squid3/include/asn1.h 19 Feb 2008 10:27:14 -0000 1.1.74.1 @@ -1,6 +1,9 @@ #ifndef SQUID_SNMP_ASN1_H #define SQUID_SNMP_ASN1_H +/* Squid autoconf definitions */ +#include "config.h" + /* * Definitions for Abstract Syntax Notation One, ASN.1 * As defined in ISO/IS 8824 and ISO/IS 8825 @@ -28,12 +31,12 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * $Id: asn1.h,v 1.1 2002/10/14 00:18:18 squidadm Exp $ + * $Id: asn1.h,v 1.1.74.1 2008/02/19 10:27:14 amosjeffries Exp $ * **********************************************************************/ #ifndef EIGHTBIT_SUBIDS -typedef u_int oid; +typedef u_int8_t oid; #define MAX_SUBID 0xFFFFFFFF #else typedef u_char oid; Index: squid3/include/hash.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/hash.h,v retrieving revision 1.2 retrieving revision 1.2.72.1 diff -u -r1.2 -r1.2.72.1 --- squid3/include/hash.h 15 Oct 2002 09:27:20 -0000 1.2 +++ squid3/include/hash.h 19 Feb 2008 10:27:14 -0000 1.2.72.1 @@ -1,10 +1,12 @@ /* - * $Id: hash.h,v 1.2 2002/10/15 09:27:20 squidadm Exp $ + * $Id: hash.h,v 1.2.72.1 2008/02/19 10:27:14 amosjeffries Exp $ */ - #ifndef SQUID_HASH_H #define SQUID_HASH_H +/* Squid auto-conf definitions */ +#include "config.h" + typedef void HASHFREE(void *); typedef int HASHCMP(const void *, const void *); typedef unsigned int HASHHASH(const void *, unsigned int); Index: squid3/include/heap.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/heap.h,v retrieving revision 1.1 retrieving revision 1.1.74.1 diff -u -r1.1 -r1.1.74.1 --- squid3/include/heap.h 14 Oct 2002 00:18:18 -0000 1.1 +++ squid3/include/heap.h 19 Feb 2008 10:27:14 -0000 1.1.74.1 @@ -1,5 +1,5 @@ /* - * $Id: heap.h,v 1.1 2002/10/14 00:18:18 squidadm Exp $ + * $Id: heap.h,v 1.1.74.1 2008/02/19 10:27:14 amosjeffries Exp $ * * AUTHOR: John Dilley, Hewlett Packard * @@ -40,10 +40,12 @@ * the top of the heap (as in the smallest object key value). Child nodes * are larger than their parent. ****************************************************************************/ - #ifndef SQUID_HEAP_H #define SQUID_HEAP_H +/* Squid autoconf definitions */ +#include "config.h" + /* * Function for generating heap keys. The first argument will typically be * a dws_md_p passed in as a void *. Should find a way to get type safety Index: squid3/include/inet_ntop.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/inet_ntop.h,v retrieving revision 1.2 retrieving revision 1.2.12.1 diff -u -r1.2 -r1.2.12.1 --- squid3/include/inet_ntop.h 14 Dec 2007 05:50:52 -0000 1.2 +++ squid3/include/inet_ntop.h 19 Feb 2008 10:27:14 -0000 1.2.12.1 @@ -1,6 +1,8 @@ #ifndef _INC_INET_NTOP_H #define _INC_INET_NTOP_H +#include "config.h" + #if HAVE_INET_NTOP /* Use the system provided version where possible */ Index: squid3/include/inet_pton.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/inet_pton.h,v retrieving revision 1.2 retrieving revision 1.2.12.1 diff -u -r1.2 -r1.2.12.1 --- squid3/include/inet_pton.h 14 Dec 2007 05:50:52 -0000 1.2 +++ squid3/include/inet_pton.h 19 Feb 2008 10:27:14 -0000 1.2.12.1 @@ -1,6 +1,8 @@ #ifndef _INC_INET_PTON_H #define _INC_INET_PTON_H +#include "config.h" + #if HAVE_INET_PTON /* Use the system provided version where possible */ Index: squid3/include/initgroups.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/initgroups.h,v retrieving revision 1.2 retrieving revision 1.2.50.1 diff -u -r1.2 -r1.2.50.1 --- squid3/include/initgroups.h 7 Nov 2004 03:13:13 -0000 1.2 +++ squid3/include/initgroups.h 19 Feb 2008 10:27:14 -0000 1.2.50.1 @@ -1,9 +1,11 @@ /* - * $Id: initgroups.h,v 1.2 2004/11/07 03:13:13 squidadm Exp $ + * $Id: initgroups.h,v 1.2.50.1 2008/02/19 10:27:14 amosjeffries Exp $ */ #ifndef SQUID_INITGROUPS_H #define SQUID_INITGROUPS_H +#include "config.h" + /* if you have configure you can use this */ #if defined(HAVE_CONFIG_H) #include "config.h" @@ -14,4 +16,5 @@ #endif SQUIDCEXTERN int initgroups(const char *user, gid_t group); + #endif /* SQUID_INITGROPS_H */