=== modified file 'compat/Makefile.am'
--- compat/Makefile.am	2009-11-12 01:12:50 +0000
+++ compat/Makefile.am	2009-11-21 22:22:45 +0000
@@ -18,6 +18,7 @@
 	debug.h \
 	fdsetsize.h \
 	osdetect.h \
+	posix.h \
 	stdvarargs.h \
 	valgrind.h \
 	\

=== modified file 'compat/compat.h'
--- compat/compat.h	2009-11-10 14:44:34 +0000
+++ compat/compat.h	2009-11-21 22:22:45 +0000
@@ -79,6 +79,9 @@
 /* component-specific portabilities                  */
 /*****************************************************/
 
+/* some POSIX contants need help. */
+#include "compat/posix.h"
+
 /* helper debugging requires some hacks to be clean */
 #include "compat/debug.h"
 

=== modified file 'compat/os/windows.h'
--- compat/os/windows.h	2009-02-07 13:59:04 +0000
+++ compat/os/windows.h	2009-11-21 23:32:00 +0000
@@ -49,5 +49,16 @@
 #undef _MSWIN_ACL_WAS_NOT_DEFINED
 #endif
 
+/*
+ * POSIX mode cannot be used for windows builds.
+ * We still need the magic numbers here.
+ */
+#if !defined(MAXHOSTNAMELEN)
+#define MAXHOSTNAMELEN    256
+#endif
+#if !defined(MAXPATHLEN)
+#define MAXPATHLEN    256
+#endif
+
 #endif /* _SQUID_WIN32_ */
 #endif /* SQUID_OS_WINDOWS_H */

=== modified file 'include/rfc1035.h'
--- include/rfc1035.h	2009-01-21 03:47:47 +0000
+++ include/rfc1035.h	2009-11-21 22:22:45 +0000
@@ -45,17 +45,15 @@
 #include <arpa/inet.h>
 #endif
 
-#include "rfc2181.h"
-
 /**
  \par RFC 1035 Section 3.1:
  *  To simplify implementations, the total length of a domain name (i.e.,
  *  label octets and label length octets) is restricted to 255 octets or
  *  less.
  *\par
- *  Clarified by RFC 2181 Section 11. (RFC2181_MAXHOSTNAMELEN)
+ *  Clarified by RFC 2181 Section 11. (MAXHOSTNAMELEN)
  */
-#define RFC1035_MAXHOSTNAMESZ RFC2181_MAXHOSTNAMELEN
+#define RFC1035_MAXHOSTNAMESZ MAXHOSTNAMELEN
 
 
 typedef struct _rfc1035_rr rfc1035_rr;

=== removed file 'include/rfc2181.h'
--- include/rfc2181.h	2008-09-29 09:56:06 +0000
+++ include/rfc2181.h	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/*
- * $Id$
- */
-#ifndef _SQUID_INCLUDE_RFC1123_H
-#define _SQUID_INCLUDE_RFC1123_H
-
-/**
- \par RFC 2181 section 11:
- *  A full domain name is limited to 255 octets (including the separators).
- *
- \par RFC 1123 section 2.1:
- *  Host software MUST handle host names of up to 63 characters and
- *  SHOULD handle host names of up to 255 characters.
- *
- *\par
- *  Also Ref: RFC 1035 Section 3.1  (RFC1035_MAXHOSTNAMESZ)
- *
- \par
- *  Squid accepts up to 255 character Hostname and Fully-Qualified Domain Names.
- *  Squid still NULL-terminates its FQDN and hotsname strings.
- */
-#define RFC2181_MAXHOSTNAMELEN	256
-
-/// Back-port macro for old squid code still using SQUIDHOSTNAMELEN without RFC reference.
-#define SQUIDHOSTNAMELEN	RFC2181_MAXHOSTNAMELEN
-
-#endif /* _SQUID_INCLUDE_RFC1123_H */

=== modified file 'lib/getfullhostname.c'
--- lib/getfullhostname.c	2009-01-21 03:47:47 +0000
+++ lib/getfullhostname.c	2009-11-21 22:22:45 +0000
@@ -75,9 +75,6 @@
 #include <netdb.h>
 #endif
 
-/* for RFC 2181 constants */
-#include "rfc2181.h"
-
 /* for xstrncpy() - may need breakign out of there. */
 #include "util.h"
 

=== modified file 'src/HierarchyLogEntry.h'
--- src/HierarchyLogEntry.h	2009-08-23 09:30:49 +0000
+++ src/HierarchyLogEntry.h	2009-11-21 22:22:45 +0000
@@ -36,7 +36,6 @@
 
 #include "hier_code.h"
 #include "lookup_t.h"
-#include "rfc2181.h"
 #include "PingData.h"
 
 /* for http_status */

=== modified file 'src/globals.h'
--- src/globals.h	2009-08-23 09:30:49 +0000
+++ src/globals.h	2009-11-21 22:22:45 +0000
@@ -36,8 +36,6 @@
 #include <stdio.h>
 #endif
 
-#include "rfc2181.h"
-
 /* for ERROR_BUF_SZ, BUFSIZ, MAXHTTPPORTS */
 #include "defines.h"
 

=== modified file 'src/squid.h'
--- src/squid.h	2009-02-18 00:18:43 +0000
+++ src/squid.h	2009-11-21 22:22:45 +0000
@@ -139,9 +139,6 @@
 #if HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
 #ifdef _SQUID_WIN32_
 #include <io.h>
 #endif
@@ -201,15 +198,6 @@
 #include <math.h>
 #endif
 
-#if 0  // moved to include/rfc2181.h - RFC defined constants
-#define SQUIDHOSTNAMELEN 256
-#endif
-
-#define SQUID_MAXPATHLEN 256
-#ifndef MAXPATHLEN
-#define MAXPATHLEN SQUID_MAXPATHLEN
-#endif
-
 #if !HAVE_STRUCT_RUSAGE
 /*
  * If we don't have getrusage() then we create a fake structure