Index: lib/libcvs.dsp =================================================================== RCS file: /cvs/ccvs/lib/libcvs.dsp,v retrieving revision 1.4 diff -u -p -r1.4 libcvs.dsp --- lib/libcvs.dsp 26 Apr 2004 14:16:56 -0000 1.4 +++ lib/libcvs.dsp 13 May 2004 18:30:21 -0000 @@ -109,6 +109,10 @@ SOURCE=.\getopt1.c # End Source File # Begin Source File +SOURCE=.\nanosleep.c +# End Source File +# Begin Source File + SOURCE=".\printf-args.c" # End Source File # Begin Source File Index: windows-NT/unistd.h =================================================================== RCS file: /cvs/ccvs/windows-NT/unistd.h,v retrieving revision 1.1 diff -u -p -r1.1 unistd.h --- windows-NT/unistd.h 12 May 2004 19:01:26 -0000 1.1 +++ windows-NT/unistd.h 13 May 2004 18:30:21 -0000 @@ -21,6 +21,66 @@ #ifndef UNISTD_H #define UNISTD_H +#if 0 +/* This include works when compiling "libcvs" project + and blows up when compiling "libdiff" project */ +#include +#else +/* The following statements taken from VC 6.0 "winsock.h" file */ +/* + * Basic system type definitions, taken from the BSD file sys/types.h. + */ +typedef unsigned char u_char; +typedef unsigned short u_short; +typedef unsigned int u_int; +typedef unsigned long u_long; + +/* + * The new type to be used in all + * instances which refer to sockets. + */ +typedef u_int SOCKET; + +/* + * Select uses arrays of SOCKETs. These macros manipulate such + * arrays. FD_SETSIZE may be defined by the user before including + * this file, but the default here should be >= 64. + * + * CAVEAT IMPLEMENTOR and USER: THESE MACROS AND TYPES MUST BE + * INCLUDED IN WINSOCK.H EXACTLY AS SHOWN HERE. + */ +#ifndef FD_SETSIZE +#define FD_SETSIZE 64 +#endif /* FD_SETSIZE */ + +/* Structure redefinition error when "winsock.h" follows */ +typedef struct fd_set { + u_int fd_count; /* how many are SET? */ + SOCKET fd_array[FD_SETSIZE]; /* an array of SOCKETs */ +} fd_set; + +/* + * Structure used in select() call, taken from the BSD file sys/time.h. + */ +/* Structure redefinition error when "winsock.h" follows */ +struct timeval { + long tv_sec; /* seconds */ + long tv_usec; /* and microseconds */ +}; + +#if 0 +/* These defines create warnings when "windef.h" include follows */ +#define FAR +#define PASCAL _stdcall + +int PASCAL FAR select (int nfds, fd_set FAR *readfds, fd_set FAR *writefds, + fd_set FAR *exceptfds, const struct timeval FAR *timeout); +#else +int _stdcall select (int nfds, fd_set *readfds, fd_set *writefds, + fd_set *exceptfds, const struct timeval *timeout); +#endif +#endif + char * getpass (const char *prompt); #if 0 /* someday maybe these should be added here as well */