libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-18 15:09:32 +08:00
Code Issues Projects Releases Wiki Activity

* select.h: Remove.

Browse Source 
* fhandler_socket.cc: Don't include select.h.
	* select.cc: Ditto.
This commit is contained in:
Corinna Vinschen 2006-07-25 17:37:28 +00:00
parent 79097ba627
commit 113fcaa1b2
4 changed files with 7 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2006-07-25 Corinna Vinschen <corinna@vinschen.de>
* select.h: Remove.
* fhandler_socket.cc: Don't include select.h.
* select.cc: Ditto.
2006-07-25 Corinna Vinschen <corinna@vinschen.de>
* cygtls.h: Drop socket related includes.

1
winsup/cygwin/fhandler_socket.cc
View File

@ -33,7 +33,6 @@
#include "shared_info.h"
#include "sigproc.h"
#include "cygthread.h"
#include "select.h"
#include "wininfo.h"
#include <unistd.h>
#include <sys/acl.h>

3
winsup/cygwin/select.cc
View File

@ -1,7 +1,7 @@
/* select.cc
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005 Red Hat, Inc.
2005, 2006 Red Hat, Inc.
Written by Christopher Faylor of Cygnus Solutions
cgf@cygnus.com
@ -30,7 +30,6 @@ details. */
#define USE_SYS_TYPES_FD_SET
#include <winsock.h>
#include "cygerrno.h"
#include "select.h"
#include "security.h"
#include "path.h"
#include "fhandler.h"

55
winsup/cygwin/select.h
View File

@ -1,55 +0,0 @@
/* select.h
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.
This file is part of Cygwin.
This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
/* Winsock select() types and macros */
/*
* Use this struct to interface to
* the system provided select.
*/
typedef struct winsock_fd_set
{
unsigned int fd_count;
HANDLE fd_array[1024]; /* Dynamically allocated. */
} winsock_fd_set;
/*
* Define the Win32 winsock definitions to have a prefix WINSOCK_
* so we can be explicit when we are using them.
*/
#define WINSOCK_FD_ISSET(fd, set) __WSAFDIsSet ((SOCKET)fd, (fd_set *)set)
#define WINSOCK_FD_SET(fd, set) do { \
(set)->fd_array[(set)->fd_count++]=fd;\
} while(0)
#define WINSOCK_FD_ZERO(set) ((set)->fd_count = 0)
#define WINSOCK_FD_CLR(fd, set) do { \
u_int __i; \
for (__i = 0; __i < (set)->fd_count ; __i++) { \
if ((set)->fd_array[__i] == fd) { \
while (__i < (set)->fd_count-1) { \
(set)->fd_array[__i] = \
(set)->fd_array[__i+1]; \
__i++; \
} \
(set)->fd_count--; \
break; \
} \
} \
} while(0)
extern "C" int PASCAL __WSAFDIsSet(SOCKET, fd_set*);
extern "C" int PASCAL win32_select(int, fd_set*, fd_set*, fd_set*, const struct timeval*);
/*
* call to winsock's select() -
* type coercion need to appease confused prototypes
*/
#define WINSOCK_SELECT(nfd, rd, wr, ex, timeo) \
win32_select (nfd, (fd_set *) rd, (fd_set *) wr, (fd_set *) ex, timeo)