Force-solved getpagesize() misdetection issue.

diff --git a/compat/os/mswin.h b/compat/os/mswin.h
index e8373f2b61031e50bc111144df2a556f691ecd09..a3ff36daadff83bf664cfbf9853ee8905a51766c 100644 (file)
--- a/compat/os/mswin.h
+++ b/compat/os/mswin.h
@@ -803,9 +803,14 @@ SQUIDCEXTERN struct group * getgrnam(char *unused);
 #define getgid(X)   static_cast<gid_t>(100)
 #define setgid(X)   (void)0
 
+/* for some reason autoconf misdetects getpagesize.. */
+#if HAVE_GETPAGESIZE
+#undef HAVE_GETPAGESIZE
+#endif
+
 #if !HAVE_GETPAGESIZE
-/* Windows may lack getpagesize() prototype */
-SQUIDCEXTERN size_t getpagesize();
+/* And now we define a compatibility layer */
+size_t getpagesize();
 #define HAVE_GETPAGESIZE 2
 #endif
 

diff --git a/src/mem.cc b/src/mem.cc
index 90fc15a91a5899d60552b6215350e95f40d6d575..4cdc9ddb61239f29432a07b6610576dfd20e81e2 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -51,9 +51,6 @@
 #endif
 
 /* module globals */
-#if 1 || !HAVE_GETPAGESIZE
-static size_t getpagesize() { return 4096; }
-#endif
 const size_t squidSystemPageSize=getpagesize();
 
 /* local prototypes */

diff --git a/src/wccp2.cc b/src/wccp2.cc
index 521fee239de0b3c67933aee4e5d25fe37105c31f..2c8ad41325e2bd84cf2e290ce7a80e236553ccb5 100644 (file)
--- a/src/wccp2.cc
+++ b/src/wccp2.cc
@@ -1601,7 +1601,7 @@ wccp2HereIam(void *voidnotused)
                                 &service_list_ptr->wccp_packet,
                                 service_list_ptr->wccp_packet_size);
             } else {
-                send(theWccp2Connection,
+                Squid::send(theWccp2Connection,
                      &service_list_ptr->wccp_packet,
                      service_list_ptr->wccp_packet_size,
                      0);