Commit ad77420a authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

lwip: basic checks and macros for compatiblity

parent 804da995

lib/nonblock.c

+4 −4
Original line number Diff line number Diff line
@@ -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

 * 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 */

  int flags;

  flags = fcntl(sockfd, F_GETFL, 0);

  flags = sfcntl(sockfd, F_GETFL, 0);

  if(nonblock)

    return fcntl(sockfd, F_SETFL, flags | O_NONBLOCK);

    return sfcntl(sockfd, F_SETFL, flags | O_NONBLOCK);

  else

    return fcntl(sockfd, F_SETFL, flags & (~O_NONBLOCK));

    return sfcntl(sockfd, F_SETFL, flags & (~O_NONBLOCK));



#elif defined(HAVE_IOCTL_FIONBIO)

lib/setup_once.h

+12 −1
Original line number Diff line number Diff line
@@ -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

 * you should have received as part of this distribution. The terms
@@ -239,10 +239,21 @@ struct timeval { 
#  define sclose(x)  closesocket((x))

#elif defined(HAVE_CLOSESOCKET_CAMEL)

#  define sclose(x)  CloseSocket((x))

#elif defined(USE_LWIPSOCK)

#  define sclose(x)  lwip_close((x))

#else

#  define sclose(x)  close((x))

#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

 * avoid negative number inputs with argument byte codes > 127.