JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dtable.cc: Guard against new winsock.h/winsock2.h warnings when mixing

Browse Source 
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:
Christopher Faylor
2001-03-20 19:50:28 +00:00
parent d17d6d4286
commit a1299ba54b
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@@ -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>
* exceptions.cc (interruptible): Update debugging output.

2
winsup/cygwin/dtable.cc
View File

@@ -10,7 +10,6 @@ details. */
#define __INSIDE_CYGWIN_NET__
#define Win32_Winsock
#include "winsup.h"
#include <errno.h>
#include <sys/socket.h>
@@ -20,6 +19,7 @@ details. */
#include <fcntl.h>
#include <sys/cygwin.h>
#define USE_SYS_TYPES_FD_SET
#include <winsock.h>
#include "sync.h"
#include "sigproc.h"

1
winsup/cygwin/exceptions.cc
View File

@@ -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
details. */
#define Win32_Winsock
#include "winsup.h"
#include <imagehlp.h>
#include <errno.h>

2
winsup/cygwin/fhandler_socket.cc
View File

@@ -12,13 +12,13 @@
#define __INSIDE_CYGWIN_NET__
#define Win32_Winsock
#include "winsup.h"
#include <errno.h>
#include <sys/socket.h>
#include <unistd.h>
#include <fcntl.h>
#define USE_SYS_TYPES_FD_SET
#include <winsock2.h>
#include "cygheap.h"
#include "cygerrno.h"

2
winsup/cygwin/net.cc
View File

@@ -12,7 +12,6 @@ details. */
#define __INSIDE_CYGWIN_NET__
#define Win32_Winsock
#include "winsup.h"
#include <errno.h>
#include <sys/socket.h>
@@ -22,6 +21,7 @@ details. */
#include <unistd.h>
#include <netdb.h>
#include <fcntl.h>
#define USE_SYS_TYPES_FD_SET
#include <winsock2.h>
#include "cygheap.h"
#include "cygerrno.h"

4
winsup/cygwin/select.cc
View File

@@ -18,7 +18,6 @@ details. */
*/
#define __INSIDE_CYGWIN_NET__
#define Win32_Winsock
#include "winsup.h"
#include <errno.h>
@@ -31,6 +30,7 @@ details. */
#include <netdb.h>
#include <unistd.h>
#include <stdio.h>
#define USE_SYS_TYPES_FD_SET
#include <winsock.h>
#include "select.h"
#include "cygerrno.h"
@@ -66,7 +66,7 @@ typedef long fd_mask;
#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) \
((unsigned) (NULL_fd_set->fds_bits + unix_howmany((n), UNIX_NFDBITS)))
#define UNIX_FD_SET(n, p) \