COMP: Undef SETBLOCK before redefining it to remove parse warnings
This commit is contained in:
parent
7d0b2eabd6
commit
87c27b6f06
@ -153,6 +153,9 @@ int Curl_nonblock(curl_socket_t sockfd, /* operate on this */
|
|||||||
flags = nonblock;
|
flags = nonblock;
|
||||||
return ioctl(sockfd, FIONBIO, &flags);
|
return ioctl(sockfd, FIONBIO, &flags);
|
||||||
}
|
}
|
||||||
|
#ifdef SETBLOCK
|
||||||
|
# undef SETBLOCK
|
||||||
|
#endif
|
||||||
#define SETBLOCK 2
|
#define SETBLOCK 2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -167,6 +170,9 @@ int Curl_nonblock(curl_socket_t sockfd, /* operate on this */
|
|||||||
#ifdef HAVE_IOCTLSOCKET_CASE
|
#ifdef HAVE_IOCTLSOCKET_CASE
|
||||||
/* presumably for Amiga */
|
/* presumably for Amiga */
|
||||||
return IoctlSocket(sockfd, FIONBIO, (long)nonblock);
|
return IoctlSocket(sockfd, FIONBIO, (long)nonblock);
|
||||||
|
#ifdef SETBLOCK
|
||||||
|
# undef SETBLOCK
|
||||||
|
#endif
|
||||||
#define SETBLOCK 4
|
#define SETBLOCK 4
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -174,6 +180,9 @@ int Curl_nonblock(curl_socket_t sockfd, /* operate on this */
|
|||||||
/* BeOS */
|
/* BeOS */
|
||||||
long b = nonblock ? 1 : 0;
|
long b = nonblock ? 1 : 0;
|
||||||
return setsockopt(sockfd, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
|
return setsockopt(sockfd, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
|
||||||
|
#ifdef SETBLOCK
|
||||||
|
# undef SETBLOCK
|
||||||
|
#endif
|
||||||
#define SETBLOCK 5
|
#define SETBLOCK 5
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -181,6 +190,9 @@ int Curl_nonblock(curl_socket_t sockfd, /* operate on this */
|
|||||||
(void)nonblock;
|
(void)nonblock;
|
||||||
(void)sockfd;
|
(void)sockfd;
|
||||||
return 0; /* returns success */
|
return 0; /* returns success */
|
||||||
|
#ifdef SETBLOCK
|
||||||
|
# undef SETBLOCK
|
||||||
|
#endif
|
||||||
#define SETBLOCK 6
|
#define SETBLOCK 6
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user