* dtable.cc: Guard against new winsock.h/winsock2.h warnings when mixing
winsock*.h and sys/types.h. * fhandler_socket.cc: Ditto. * net.cc: Ditto. * select.cc: Ditto. * exceptions.cc: Remove unneeded define.
This commit is contained in:
parent
d17d6d4286
commit
a1299ba54b
|
@ -1,3 +1,12 @@
|
||||||
|
Tue Mar 20 14:48:46 2001 Christopher Faylor <cgf@cygnus.com>
|
||||||
|
|
||||||
|
* dtable.cc: Guard against new winsock.h/winsock2.h warnings when
|
||||||
|
mixing winsock*.h and sys/types.h.
|
||||||
|
* fhandler_socket.cc: Ditto.
|
||||||
|
* net.cc: Ditto.
|
||||||
|
* select.cc: Ditto.
|
||||||
|
* exceptions.cc: Remove unneeded define.
|
||||||
|
|
||||||
Mon Mar 19 17:43:29 2001 Christopher Faylor <cgf@cygnus.com>
|
Mon Mar 19 17:43:29 2001 Christopher Faylor <cgf@cygnus.com>
|
||||||
|
|
||||||
* exceptions.cc (interruptible): Update debugging output.
|
* exceptions.cc (interruptible): Update debugging output.
|
||||||
|
|
|
@ -10,7 +10,6 @@ details. */
|
||||||
|
|
||||||
#define __INSIDE_CYGWIN_NET__
|
#define __INSIDE_CYGWIN_NET__
|
||||||
|
|
||||||
#define Win32_Winsock
|
|
||||||
#include "winsup.h"
|
#include "winsup.h"
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
@ -20,6 +19,7 @@ details. */
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <sys/cygwin.h>
|
#include <sys/cygwin.h>
|
||||||
|
|
||||||
|
#define USE_SYS_TYPES_FD_SET
|
||||||
#include <winsock.h>
|
#include <winsock.h>
|
||||||
#include "sync.h"
|
#include "sync.h"
|
||||||
#include "sigproc.h"
|
#include "sigproc.h"
|
||||||
|
|
|
@ -8,7 +8,6 @@ This software is a copyrighted work licensed under the terms of the
|
||||||
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
||||||
details. */
|
details. */
|
||||||
|
|
||||||
#define Win32_Winsock
|
|
||||||
#include "winsup.h"
|
#include "winsup.h"
|
||||||
#include <imagehlp.h>
|
#include <imagehlp.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
|
@ -12,13 +12,13 @@
|
||||||
|
|
||||||
#define __INSIDE_CYGWIN_NET__
|
#define __INSIDE_CYGWIN_NET__
|
||||||
|
|
||||||
#define Win32_Winsock
|
|
||||||
#include "winsup.h"
|
#include "winsup.h"
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#define USE_SYS_TYPES_FD_SET
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#include "cygheap.h"
|
#include "cygheap.h"
|
||||||
#include "cygerrno.h"
|
#include "cygerrno.h"
|
||||||
|
|
|
@ -12,7 +12,6 @@ details. */
|
||||||
|
|
||||||
#define __INSIDE_CYGWIN_NET__
|
#define __INSIDE_CYGWIN_NET__
|
||||||
|
|
||||||
#define Win32_Winsock
|
|
||||||
#include "winsup.h"
|
#include "winsup.h"
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
@ -22,6 +21,7 @@ details. */
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#define USE_SYS_TYPES_FD_SET
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#include "cygheap.h"
|
#include "cygheap.h"
|
||||||
#include "cygerrno.h"
|
#include "cygerrno.h"
|
||||||
|
|
|
@ -18,7 +18,6 @@ details. */
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define __INSIDE_CYGWIN_NET__
|
#define __INSIDE_CYGWIN_NET__
|
||||||
#define Win32_Winsock
|
|
||||||
|
|
||||||
#include "winsup.h"
|
#include "winsup.h"
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
@ -31,6 +30,7 @@ details. */
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#define USE_SYS_TYPES_FD_SET
|
||||||
#include <winsock.h>
|
#include <winsock.h>
|
||||||
#include "select.h"
|
#include "select.h"
|
||||||
#include "cygerrno.h"
|
#include "cygerrno.h"
|
||||||
|
@ -66,7 +66,7 @@ typedef long fd_mask;
|
||||||
|
|
||||||
#define unix_fd_set fd_set
|
#define unix_fd_set fd_set
|
||||||
|
|
||||||
#define NULL_fd_set ((fd_set *)NULL)
|
#define NULL_fd_set ((fd_set *) NULL)
|
||||||
#define sizeof_fd_set(n) \
|
#define sizeof_fd_set(n) \
|
||||||
((unsigned) (NULL_fd_set->fds_bits + unix_howmany((n), UNIX_NFDBITS)))
|
((unsigned) (NULL_fd_set->fds_bits + unix_howmany((n), UNIX_NFDBITS)))
|
||||||
#define UNIX_FD_SET(n, p) \
|
#define UNIX_FD_SET(n, p) \
|
||||||
|
|
Loading…
Reference in New Issue