Commit 839441e2 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Minor portability fixes to get things running on UNICOS 9.0 on a Cray Y-MP

parent ba9ea943

docs/INSTALL

+1 −0
Original line number Diff line number Diff line
@@ -684,6 +684,7 @@ PORTS 
        - StrongARM/ARM7/ARM9 Linux 2.4, 2.6

        - StrongARM NetBSD 1.4.1

        - Ultrix 4.3a

        - UNICOS 9.0

        - i386 BeOS

        - i386 DOS

        - i386 eCos 1.3.1

lib/hostip.c

+6 −4
Original line number Diff line number Diff line
@@ -409,11 +409,13 @@ int Curl_resolv(struct connectdata *conn, 
#ifdef HAVE_SIGSETJMP

  /* this allows us to time-out from the name resolver, as the timeout

     will generate a signal and we will siglongjmp() from that here */

  if(!data->set.no_signal && sigsetjmp(curl_jmpenv, 1)) {

  if(!data->set.no_signal) {

    if (sigsetjmp(curl_jmpenv, 1)) {

      /* this is coming from a siglongjmp() */

      failf(data, "name lookup timed out");

      return CURLRESOLV_ERROR;

    }

  }

#endif



  /* Create an entry id, based upon the hostname and port */

lib/if2ip.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ char *Curl_if2ip(const char *interface, char *buf, int buf_size) 
      struct in_addr in;



      struct sockaddr_in *s = (struct sockaddr_in *)&req.ifr_dstaddr;

      memcpy(&in, &(s->sin_addr.s_addr), sizeof(in));

      memcpy(&in, &s->sin_addr, sizeof(in));

      ip = (char *) Curl_inet_ntop(s->sin_family, &in, buf, buf_size);

    }

    sclose(dummy);

src/main.c

+4 −1
Original line number Diff line number Diff line
@@ -1180,9 +1180,12 @@ static int str2offset(curl_off_t *val, char *str) 
   * definitions for LLONG_{MIN,MAX} or LONG_LONG_{MIN,MAX}.

   */

#ifndef LLONG_MAX

#ifdef _MSC_VER

#if defined(_MSC_VER)

#define LLONG_MAX (curl_off_t)0x7FFFFFFFFFFFFFFFi64

#define LLONG_MIN (curl_off_t)0x8000000000000000i64

#elif defined(_CRAYC)

#define LLONG_MAX (curl_off_t)0x7FFFFFFFFFFFFFFF

#define LLONG_MIN (curl_off_t)0x8000000000000000

#else

#define LLONG_MAX (curl_off_t)0x7FFFFFFFFFFFFFFFLL

#define LLONG_MIN (curl_off_t)0x8000000000000000LL