moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

lwip: basic checks and macros for compatiblity

Browse Source
This commit is contained in:
Daniel Stenberg 2012-03-17 23:02:21 +01:00
parent 804da995c5
commit ad77420ac7
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nonblock.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -61,11 +61,11 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
/* most recent unix versions */ /* most recent unix versions */
int flags; int flags;
flags = fcntl(sockfd, F_GETFL, 0); flags = sfcntl(sockfd, F_GETFL, 0);
if(nonblock) if(nonblock)
return fcntl(sockfd, F_SETFL, flags | O_NONBLOCK); return sfcntl(sockfd, F_SETFL, flags | O_NONBLOCK);
else else
return fcntl(sockfd, F_SETFL, flags & (~O_NONBLOCK)); return sfcntl(sockfd, F_SETFL, flags & (~O_NONBLOCK));
#elif defined(HAVE_IOCTL_FIONBIO) #elif defined(HAVE_IOCTL_FIONBIO)

13
lib/setup_once.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -239,10 +239,21 @@ struct timeval {
# define sclose(x) closesocket((x)) # define sclose(x) closesocket((x))
#elif defined(HAVE_CLOSESOCKET_CAMEL) #elif defined(HAVE_CLOSESOCKET_CAMEL)
# define sclose(x) CloseSocket((x)) # define sclose(x) CloseSocket((x))
#elif defined(USE_LWIPSOCK)
# define sclose(x) lwip_close((x))
#else #else
# define sclose(x) close((x)) # define sclose(x) close((x))
#endif #endif
/*
* Stack-independent version of fcntl() on sockets:
*/
#if defined(USE_LWIPSOCK)
# define sfcntl lwip_fcntl
#else
# define sfcntl fcntl
#endif
/* /*
* Uppercase macro versions of ANSI/ISO is*() functions/macros which * Uppercase macro versions of ANSI/ISO is*() functions/macros which
* avoid negative number inputs with argument byte codes > 127. * avoid negative number inputs with argument byte codes > 127.