moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 20:15:03 -05:00
Code Issues Releases Wiki Activity

geterrno() renamed to ourerrno() to prevent the name clash that occurred in

Browse Source 
AIX 3.2.5 and possibly other OSF-like system headers.
This commit is contained in:
Daniel Stenberg 2003-02-14 09:01:01 +00:00
parent 977175d4fd
commit 498f3985b3
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/connect.c
View File

@ -81,12 +81,8 @@
#include "memdebug.h"
#endif
/* The AIX 3.2.5 system headers define a function called geterrno() which
we won't need but that interferes with our function */
#undef geterrno
static
int geterrno(void)
int ourerrno(void)
{
#ifdef WIN32
return (int)GetLastError();
@ -350,7 +346,7 @@ int socketerror(int sockfd)
if( -1 == getsockopt(sockfd, SOL_SOCKET, SO_ERROR,
(void *)&err, &errSize))
err = geterrno();
err = ourerrno();
return err;
}
@ -523,7 +519,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
rc = connect(sockfd, ai->ai_addr, ai->ai_addrlen);
if(-1 == rc) {
int error=geterrno();
int error=ourerrno();
switch (error) {
case EINPROGRESS:
@ -642,7 +638,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
sizeof(serv_addr));
if(-1 == rc) {
int error=geterrno();
int error=ourerrno();
switch (error) {
case EINPROGRESS: