Commit 3184a91e authored by Yang Tse's avatar Yang Tse
Browse files

VMS specific preprocessor symbol checking adjustments

parent 0dde9056

ares/setup_once.h

+2 −2
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ typedef int sig_atomic_t; 
 *  Actually use __32_getpwuid() on 64-bit VMS builds for getpwuid()

 */



#if defined(VMS) && \

#if defined(__VMS) && \

    defined(__INITIAL_POINTER_SIZE) && (__INITIAL_POINTER_SIZE == 64)

#define getpwuid __32_getpwuid

#endif
@@ -425,7 +425,7 @@ typedef int sig_atomic_t; 
 * Macro argv_item_t hides platform details to code using it.

 */



#ifdef VMS

#ifdef __VMS

#define argv_item_t  __char_ptr32

#else

#define argv_item_t  char *

include/curl/curlbuild.h.dist

+10 −10
Original line number Diff line number Diff line
@@ -370,16 +370,7 @@ 
#  define CURL_SIZEOF_CURL_SOCKLEN_T 4



#elif defined(__VMS)

#  if defined(__alpha) || defined(__ia64)

#    define CURL_SIZEOF_LONG           4

#    define CURL_TYPEOF_CURL_OFF_T     long long

#    define CURL_FORMAT_CURL_OFF_T     "lld"

#    define CURL_FORMAT_CURL_OFF_TU    "llu"

#    define CURL_FORMAT_OFF_T          "%lld"

#    define CURL_SIZEOF_CURL_OFF_T     8

#    define CURL_SUFFIX_CURL_OFF_T     LL

#    define CURL_SUFFIX_CURL_OFF_TU    ULL

#  else

#  if defined(__VAX)

#    define CURL_SIZEOF_LONG           4

#    define CURL_TYPEOF_CURL_OFF_T     long

#    define CURL_FORMAT_CURL_OFF_T     "ld"
@@ -388,6 +379,15 @@ 
#    define CURL_SIZEOF_CURL_OFF_T     4

#    define CURL_SUFFIX_CURL_OFF_T     L

#    define CURL_SUFFIX_CURL_OFF_TU    UL

#  else

#    define CURL_SIZEOF_LONG           4

#    define CURL_TYPEOF_CURL_OFF_T     long long

#    define CURL_FORMAT_CURL_OFF_T     "lld"

#    define CURL_FORMAT_CURL_OFF_TU    "llu"

#    define CURL_FORMAT_OFF_T          "%lld"

#    define CURL_SIZEOF_CURL_OFF_T     8

#    define CURL_SUFFIX_CURL_OFF_T     LL

#    define CURL_SUFFIX_CURL_OFF_TU    ULL

#  endif

#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int

#  define CURL_SIZEOF_CURL_SOCKLEN_T 4

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
#undef in_addr_t

#define in_addr_t unsigned long

#endif

#ifdef VMS

#ifdef __VMS

#include <in.h>

#include <inet.h>

#endif

lib/curl_addrinfo.c

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#  include <arpa/inet.h>

#endif



#ifdef  VMS

#ifdef __VMS

#  include <in.h>

#  include <inet.h>

#  include <stdlib.h>
@@ -365,7 +365,7 @@ Curl_ip2addr(int af, const void *inaddr, const char *hostname, int port) 
{

  Curl_addrinfo *ai;



#if defined(VMS) && \

#if defined(__VMS) && \

    defined(__INITIAL_POINTER_SIZE) && (__INITIAL_POINTER_SIZE == 64)

#pragma pointer_size save

#pragma pointer_size short
@@ -418,7 +418,7 @@ Curl_ip2addr(int af, const void *inaddr, const char *hostname, int port) 
  h->h_addr_list[0] = addrentry;

  h->h_addr_list[1] = NULL; /* terminate list of entries */



#if defined(VMS) && \

#if defined(__VMS) && \

    defined(__INITIAL_POINTER_SIZE) && (__INITIAL_POINTER_SIZE == 64)

#pragma pointer_size restore

#pragma message enable PTRMISMATCH

lib/curl_addrinfo.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#  include <arpa/inet.h>

#endif



#ifdef  VMS

#ifdef __VMS

#  include <in.h>

#  include <inet.h>

#  include <stdlib.h>