Commit 498f3985 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

AIX 3.2.5 and possibly other OSF-like system headers.
parent 977175d4

lib/connect.c

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