From 264b4d681ae1aa10f15436fa7db8c547d112a381 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 1 May 2010 00:59:12 +1200 Subject: [PATCH] Bug 2863: pt 1: Some Cygwin compile errors --- compat/os/mswin.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/compat/os/mswin.h b/compat/os/mswin.h index 2c3944ab13..80dd9c6c38 100644 --- a/compat/os/mswin.h +++ b/compat/os/mswin.h @@ -177,8 +177,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 */ @@ -253,16 +255,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 */ @@ -705,6 +728,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 +#else #define RUSAGE_SELF 0 /* calling process */ #define RUSAGE_CHILDREN -1 /* terminated child processes */ @@ -726,6 +752,7 @@ struct rusage { long ru_nvcsw; /* voluntary context switches */ long ru_nivcsw; /* involuntary context switches */ }; +#endif /* HAVE_SYS_RESOURCE_H */ #undef ACL -- 2.47.3