mirror of
https://github.com/moparisthebest/curl
synced 2024-11-17 23:15:08 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and
renames lib/setup_once.h to lib/curl_setup_once.h.
Removes the need and usage of a header inclusion guard foreign
to libcurl. [1]
Removes the need and presence of an alarming notice we carried
in old setup_once.h [2]
----------------------------------------
1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard
up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H,
this single inclusion guard is enough to ensure that inclusion of
lib/setup_once.h done from lib/setup.h is only done once.
Additionally lib/setup.h has always used __SETUP_ONCE_H macro to
protect inclusion of setup_once.h even after commit ec691ca3, this
was to avoid a circular header inclusion triggered when building a
c-ares enabled version with c-ares sources available which also has
a setup_once.h header. Commit ec691ca3 exposes the real nature of
__SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard
foreign to libcurl belonging to c-ares's setup_once.h
The renaming this commit does, fixes the circular header inclusion,
and as such removes the need and usage of a header inclusion guard
foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl.
2 - Due to the circular interdependency of old lib/setup_once.h and the
c-ares setup_once.h header, old file lib/setup_once.h has carried
back from 2006 up to now days an alarming and prominent notice about
the need of keeping libcurl's and c-ares's setup_once.h in sync.
Given that this commit fixes the circular interdependency, the need
and presence of mentioned notice is removed.
All mentioned interdependencies come back from now old days when
the c-ares project lived inside a curl subdirectory. This commit
removes last traces of such fact.
109 lines
3.0 KiB
C
109 lines
3.0 KiB
C
#ifndef HEADER_CURL_SELECT_H
|
|
#define HEADER_CURL_SELECT_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef HAVE_SYS_POLL_H
|
|
#include <sys/poll.h>
|
|
#elif defined(HAVE_POLL_H)
|
|
#include <poll.h>
|
|
#endif
|
|
|
|
/*
|
|
* Definition of pollfd struct and constants for platforms lacking them.
|
|
*/
|
|
|
|
#if !defined(HAVE_STRUCT_POLLFD) && \
|
|
!defined(HAVE_SYS_POLL_H) && \
|
|
!defined(HAVE_POLL_H)
|
|
|
|
#define POLLIN 0x01
|
|
#define POLLPRI 0x02
|
|
#define POLLOUT 0x04
|
|
#define POLLERR 0x08
|
|
#define POLLHUP 0x10
|
|
#define POLLNVAL 0x20
|
|
|
|
struct pollfd
|
|
{
|
|
curl_socket_t fd;
|
|
short events;
|
|
short revents;
|
|
};
|
|
|
|
#endif
|
|
|
|
#ifndef POLLRDNORM
|
|
#define POLLRDNORM POLLIN
|
|
#endif
|
|
|
|
#ifndef POLLWRNORM
|
|
#define POLLWRNORM POLLOUT
|
|
#endif
|
|
|
|
#ifndef POLLRDBAND
|
|
#define POLLRDBAND POLLPRI
|
|
#endif
|
|
|
|
/* there are three CSELECT defines that are defined in the public header that
|
|
are exposed to users, but this *IN2 bit is only ever used internally and
|
|
therefore defined here */
|
|
#define CURL_CSELECT_IN2 (CURL_CSELECT_ERR << 1)
|
|
|
|
int Curl_socket_check(curl_socket_t readfd, curl_socket_t readfd2,
|
|
curl_socket_t writefd,
|
|
long timeout_ms);
|
|
|
|
/* provide the former API internally */
|
|
#define Curl_socket_ready(x,y,z) \
|
|
Curl_socket_check(x, CURL_SOCKET_BAD, y, z)
|
|
|
|
int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms);
|
|
|
|
int Curl_wait_ms(int timeout_ms);
|
|
|
|
#ifdef TPF
|
|
int tpf_select_libcurl(int maxfds, fd_set* reads, fd_set* writes,
|
|
fd_set* excepts, struct timeval* tv);
|
|
#endif
|
|
|
|
/* Winsock and TPF sockets are not in range [0..FD_SETSIZE-1], which
|
|
unfortunately makes it impossible for us to easily check if they're valid
|
|
*/
|
|
#if defined(USE_WINSOCK) || defined(TPF)
|
|
#define VALID_SOCK(x) 1
|
|
#define VERIFY_SOCK(x) Curl_nop_stmt
|
|
#else
|
|
#define VALID_SOCK(s) (((s) >= 0) && ((s) < FD_SETSIZE))
|
|
#define VERIFY_SOCK(x) do { \
|
|
if(!VALID_SOCK(x)) { \
|
|
SET_SOCKERRNO(EINVAL); \
|
|
return -1; \
|
|
} \
|
|
} WHILE_FALSE
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_SELECT_H */
|
|
|