More include guards and argument type adaptation

diff --git a/compat/os/mswin.h b/compat/os/mswin.h
index 055566182a14ac9294660ab7f0c8582f231eb1ec..a4a8a9a21c0c8fe6ebe46b350e4e94a1faa54c71 100644 (file)
--- a/compat/os/mswin.h
+++ b/compat/os/mswin.h
@@ -575,7 +575,8 @@ listen(int s, int b)
     } else
         return 0;
 }
-#define listen(s,b) Squid::listen(s,b)
+//#define listen(s,b) Squid::listen(s,b)
+using Squid::listen;
 
 inline ssize_t
 recv(int s, void * b, size_t l, int f)
@@ -590,16 +591,17 @@ recv(int s, void * b, size_t l, int f)
 #define recv(s,b,l,f) Squid::recv(s,b,l,f)
 
 inline ssize_t
-recvfrom(int s, void * b, size_t l, int f, struct sockaddr * fr, socklen_t * fl)
+recvfrom(int s, void * b, size_t l, int f, struct sockaddr * fr, size_t * fl)
 {
     ssize_t result;
-    if ((result = ::recvfrom(_get_osfhandle(s), (char *)b, l, f, fr, fl)) == SOCKET_ERROR) {
+    int ifl=*fl;
+    if ((result = ::recvfrom(_get_osfhandle(s), (char *)b, l, f, fr, &ifl)) == SOCKET_ERROR) {
         errno = WSAGetLastError();
         return -1;
     } else
         return result;
 }
-#define recvfrom(s,b,l,f,fr,fl) Squid::recvfrom(s,b,l,f,fr,fl)
+using Squid::recvfrom;
 
 inline int
 select(int n, fd_set * r, fd_set * w, fd_set * e, struct timeval * t)
@@ -623,7 +625,8 @@ send(int s, const void * b, size_t l, int f)
     } else
         return result;
 }
-#define send(s,b,l,f) Squid::send(s,b,l,f)
+using Squid::send;
+//#define send(s,b,l,f) Squid::send(s,b,l,f)
 
 inline ssize_t
 sendto(int s, const void * b, size_t l, int f, const struct sockaddr * t, socklen_t tl)

diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
index 1c0b937e5bcc25ff7c3e2a6e43fc7dc3820b1ee9..afbb5335babbdbdd3afc100e738db1828997c4e0 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
@@ -36,9 +36,15 @@
 #include "squid-old.h"
 #include "comm/Loops.h"
 
+#if HAVE_SYS_IPC_H
 #include <sys/ipc.h>
+#endif
+#if HAVE_SYS_MSG_H
 #include <sys/msg.h>
+#endif
+#if HAVE_SYS_SHM_H
 #include <sys/shm.h>
+#endif
 #include "DiskdIOStrategy.h"
 #include "ConfigOption.h"
 #include "DiskIO/DiskFile.h"