From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 20 Apr 2010 10:50:51 +0000 (+1200)
Subject: Bug 2863: pt 1: Some Cygwin compile errors
X-Git-Tag: SQUID_3_2_0_1~284
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a61c414321464c04e6f65c2c34841b68b9702adf;p=thirdparty%2Fsquid.git

Bug 2863: pt 1: Some Cygwin compile errors
---

diff --git a/compat/os/mswin.h b/compat/os/mswin.h
index db5a7a72fd..35751b919f 100644
--- a/compat/os/mswin.h
+++ b/compat/os/mswin.h
@@ -166,8 +166,10 @@ typedef unsigned long ino_t;
 #define SIGUSR2 31	/* user defined signal 2 */
 
 typedef unsigned short int ushort;
+#if !_SQUID_CYGWIN_
 typedef int uid_t;
 typedef int gid_t;
+#endif
 
 struct passwd {
     char    *pw_name;      /* user name */
@@ -240,16 +242,37 @@ typedef char * caddr_t;
 #undef FD_OPEN
 #undef FD_READ
 #undef FD_WRITE
+
+#ifndef EISCONN
 #define EISCONN WSAEISCONN
+#endif
+#ifndef EINPROGRESS
 #define EINPROGRESS WSAEINPROGRESS
+#endif
+#ifndef EWOULDBLOCK
 #define EWOULDBLOCK WSAEWOULDBLOCK
+#endif
+#ifndef EALREADY
 #define EALREADY WSAEALREADY
+#endif
+#ifndef ETIMEDOUT
 #define ETIMEDOUT WSAETIMEDOUT
+#endif
+#ifndef ECONNREFUSED
 #define ECONNREFUSED WSAECONNREFUSED
+#endif
+#ifndef ECONNRESET
 #define ECONNRESET WSAECONNRESET
+#endif
+#ifndef ENOTCONN
 #define ENOTCONN WSAENOTCONN
+#endif
+#ifndef ERESTART
 #define ERESTART WSATRY_AGAIN
+#endif
+#ifndef EAFNOSUPPORT
 #define EAFNOSUPPORT WSAEAFNOSUPPORT
+#endif
 
 #undef h_errno
 #define h_errno errno /* we'll set it ourselves */
@@ -693,6 +716,9 @@ int WSASocket(int a, int t, int p, LPWSAPROTOCOL_INFO i, GROUP g, DWORD f)
 #define open       _open /* Needed in win32lib.c */
 #endif /* #ifdef __cplusplus */
 
+#if HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#else
 #define	RUSAGE_SELF	0		/* calling process */
 #define	RUSAGE_CHILDREN	-1		/* terminated child processes */
 
@@ -714,6 +740,7 @@ struct rusage {
     long ru_nvcsw;			/* voluntary context switches */
     long ru_nivcsw;			/* involuntary context switches */
 };
+#endif /* HAVE_SYS_RESOURCE_H */
 
 #undef ACL