--- a/src/sysproc.h	Mon Aug 13 11:33:40 2007 +0200
+++ b/src/sysproc.h	Mon Aug 13 11:35:02 2007 +0200
@@ -29,7 +29,7 @@
 
 #include "systime.h" /* necessary for sys/resource.h; also gets the
 			FD_* defines on some systems. */
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 #include <sys/resource.h>
 #endif
 
@@ -37,17 +37,61 @@
 
 #ifdef HAVE_SOCKETS	/* TCP connection support, if kernel can do it */
 # include <sys/types.h>  /* AJK */
-# include <sys/socket.h>
-# include <netdb.h>
-# include <netinet/in.h>
-# include <arpa/inet.h>
-#ifdef NEED_NET_ERRNO_H
-#include <net/errno.h>
-#endif /* NEED_NET_ERRNO_H */
+# ifndef WIN32_NATIVE
+#  include <sys/socket.h>
+#  include <netdb.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+# endif
+# ifdef NEED_NET_ERRNO_H
+#  include <net/errno.h>
+# endif /* NEED_NET_ERRNO_H */
 #elif defined (SKTPAIR)
 # include <sys/socket.h>
 #endif /* HAVE_SOCKETS */
 
+#ifdef WIN32_NATIVE
+/* Note: winsock.h already included in systime.h above */
+/* map winsock error codes to standard names */
+#define EWOULDBLOCK             WSAEWOULDBLOCK
+#define EINPROGRESS             WSAEINPROGRESS
+#define EALREADY                WSAEALREADY
+#define ENOTSOCK                WSAENOTSOCK
+#define EDESTADDRREQ            WSAEDESTADDRREQ
+#define EMSGSIZE                WSAEMSGSIZE
+#define EPROTOTYPE              WSAEPROTOTYPE
+#define ENOPROTOOPT             WSAENOPROTOOPT
+#define EPROTONOSUPPORT         WSAEPROTONOSUPPORT
+#define ESOCKTNOSUPPORT         WSAESOCKTNOSUPPORT
+#define EOPNOTSUPP              WSAEOPNOTSUPP
+#define EPFNOSUPPORT            WSAEPFNOSUPPORT
+#define EAFNOSUPPORT            WSAEAFNOSUPPORT
+#define EADDRINUSE              WSAEADDRINUSE
+#define EADDRNOTAVAIL           WSAEADDRNOTAVAIL
+#define ENETDOWN                WSAENETDOWN
+#define ENETUNREACH             WSAENETUNREACH
+#define ENETRESET               WSAENETRESET
+#define ECONNABORTED            WSAECONNABORTED
+#define ECONNRESET              WSAECONNRESET
+#define ENOBUFS                 WSAENOBUFS
+#define EISCONN                 WSAEISCONN
+#define ENOTCONN                WSAENOTCONN
+#define ESHUTDOWN               WSAESHUTDOWN
+#define ETOOMANYREFS            WSAETOOMANYREFS
+#define ETIMEDOUT               WSAETIMEDOUT
+#define ECONNREFUSED            WSAECONNREFUSED
+#define ELOOP                   WSAELOOP
+/* #define ENAMETOOLONG            WSAENAMETOOLONG */
+#define EHOSTDOWN               WSAEHOSTDOWN
+#define EHOSTUNREACH            WSAEHOSTUNREACH
+/* #define ENOTEMPTY               WSAENOTEMPTY */
+#define EPROCLIM                WSAEPROCLIM
+#define EUSERS                  WSAEUSERS
+#define EDQUOT                  WSAEDQUOT
+#define ESTALE                  WSAESTALE
+#define EREMOTE                 WSAEREMOTE
+#endif /* WIN32_NATIVE */
+
 /* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */
 #ifdef HAVE_BROKEN_INET_ADDR
 # define IN_ADDR struct in_addr
@@ -74,6 +118,22 @@
 #include <sys/select.h>
 #endif
 
+#ifdef HAVE_SYS_STROPTS_H
+#include <sys/stropts.h>	/* isastream(), I_PUSH */
+#endif
+
+#ifdef HAVE_SYS_STRTIO_H
+#include <sys/strtio.h>		/* TIOCSIGNAL */
+#endif
+
+#ifdef HAVE_PTY_H
+#include <pty.h>		/* openpty() on Tru64, Linux */
+#endif
+
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>		/* openpty() on BSD */
+#endif
+
 #ifdef FD_SET
 
 /* We could get this from param.h, but better not to depend on finding that.
@@ -101,10 +161,4 @@
 
 int poll_fds_for_input (SELECT_TYPE mask);
 
-#ifdef MSDOS
-/* #include <process.h> */
-/* Damn that local process.h!  Instead we can define P_WAIT ourselves.  */
-#define P_WAIT 1
-#endif
-
 #endif /* INCLUDED_sysproc_h_ */