*** packages/vms/build_vms.com.bak	Mon Apr 23 09:03:59 2007
--- packages/vms/build_vms.com	Mon Apr 23 09:54:59 2007
***************
*** 21,27 ****
  $! Parameter(s):
  $!
  $! P1 - LISTING will create .lis files during the C compile
! $!      DEBUG will compile and link with debug
  $!
  $! Revisions:
  $!
--- 21,29 ----
  $! Parameter(s):
  $!
  $! P1 - LISTING will create .lis files during the C compile
! $!      DEBUG will compile and link with debug; also will create compiler
! $!            listings and linker map files
! $!      64 will compile and link with 64-bit pointers
  $!
  $! Revisions:
  $!
***************
*** 75,99 ****
  $!
  $ hpssl   = 0
  $ openssl = 0
! $ cc_qual = "/define=HAVE_CONFIG_H=1/OBJ=OBJDIR:"
  $ link_qual = ""
  $ if f$trnlnm( "CURL_BUILD_NOSSL") .eqs. ""
  $ then
  $    if f$trnlnm( "OPENSSL") .nes. "" 
  $    then
  $       openssl = 1
! $       cc_qual = "/define=(HAVE_CONFIG_H=1,USE_SSLEAY=1)/OBJ=OBJDIR:"
  $       if ( f$trnlnm( "SSL$INCLUDE") .nes. "") .and. -
             ( f$trnlnm( "CURL_BUILD_NOHPSSL") .eqs. "")
  $       then hpssl = 1
  $       endif
  $    endif
  $ endif
! $ if p1 .eqs. "LISTING" then cc_qual = cc_qual + "/LIST/MACHINE"
  $ if p1 .eqs. "DEBUG" 
  $ then 
! $    cc_qual = cc_qual + "/LIST/MACHINE/DEBUG/NOOPT"
! $    link_qual = "/DEBUG"
  $ endif
  $ msg_qual = "/OBJ=OBJDIR:"
  $!
--- 77,103 ----
  $!
  $ hpssl   = 0
  $ openssl = 0
! $ cc_qual = "/define=HAVE_CONFIG_H=1"
  $ link_qual = ""
  $ if f$trnlnm( "CURL_BUILD_NOSSL") .eqs. ""
  $ then
  $    if f$trnlnm( "OPENSSL") .nes. "" 
  $    then
  $       openssl = 1
! $       cc_qual = "/define=(HAVE_CONFIG_H=1,USE_SSLEAY=1)"
  $       if ( f$trnlnm( "SSL$INCLUDE") .nes. "") .and. -
             ( f$trnlnm( "CURL_BUILD_NOHPSSL") .eqs. "")
  $       then hpssl = 1
  $       endif
  $    endif
  $ endif
! $ cc_qual = cc_qual + "/OBJ=OBJDIR:"
! $ if p1 .eqs. "64" then cc_qual = cc_qual + "/POINTER=64"
! $ if p1 .eqs. "LISTING" then cc_qual = cc_qual + "/LIST/SHOW=ALL"
  $ if p1 .eqs. "DEBUG" 
  $ then 
! $    cc_qual = cc_qual + "/LIST/SHOW=ALL/DEBUG/NOOPT"
! $    link_qual = "/DEBUG/MAP"
  $ endif
  $ msg_qual = "/OBJ=OBJDIR:"
  $!
*** src/homedir.c.bak	Wed Mar 28 12:04:10 2007
--- src/homedir.c	Mon Apr 23 08:31:23 2007
***************
*** 35,40 ****
--- 35,43 ----
  #endif
  #ifdef VMS
  #include <unixlib.h>
+ #if defined(__INITIAL_POINTER_SIZE) && __INITIAL_POINTER_SIZE == 64
+ #define getpwuid __32_getpwuid
+ #endif
  #endif
  
  #include "homedir.h"
*** lib/hostip.c.bak	Wed Mar 28 12:04:02 2007
--- lib/hostip.c	Fri Apr 20 14:49:30 2007
***************
*** 598,603 ****
--- 598,611 ----
  Curl_addrinfo *Curl_ip2addr(in_addr_t num, const char *hostname, int port)
  {
    Curl_addrinfo *ai;
+   
+ #ifdef VMS
+ #if defined(__INITIAL_POINTER_SIZE) && __INITIAL_POINTER_SIZE == 64
+ #pragma pointer_size save
+ #pragma pointer_size short
+ #pragma message disable PTRMISMATCH
+ #endif
+ #endif
    struct hostent *h;
    struct in_addr *addrentry;
    struct namebuf buffer;
***************
*** 623,629 ****
  
    /* Now store the dotted version of the address */
    snprintf((char *)h->h_name, 16, "%s", hostname);
! 
    ai = Curl_he2ai(h, port);
  
    return ai;
--- 630,641 ----
  
    /* Now store the dotted version of the address */
    snprintf((char *)h->h_name, 16, "%s", hostname);
+ #ifdef VMS
+ #if defined(__INITIAL_POINTER_SIZE) && __INITIAL_POINTER_SIZE == 64
+ #pragma pointer_size restore
+ #pragma message enable PTRMISMATCH
+ #endif
! #endif
    ai = Curl_he2ai(h, port);
  
    return ai;
*** src/main.c.bak	Wed Mar 28 12:04:10 2007
--- src/main.c	Mon Apr 23 08:41:27 2007
***************
*** 3480,3488 ****
    }
    curl_slist_free_all(easycode);
  }
! 
  static int
  operate(struct Configurable *config, int argc, char *argv[])
  {
    char errorbuffer[CURL_ERROR_SIZE];
    char useragent[128]; /* buah, we don't want a larger default user agent */
--- 3480,3493 ----
    }
    curl_slist_free_all(easycode);
  }
! #ifdef VMS
! /* Even in 64-bit mode, argv on VMS is of type const char *short *short. */
! static int
! operate(struct Configurable *config, int argc, __char_ptr32 argv[])
! #else
  static int
  operate(struct Configurable *config, int argc, char *argv[])
+ #endif
  {
    char errorbuffer[CURL_ERROR_SIZE];
    char useragent[128]; /* buah, we don't want a larger default user agent */
*** lib/netrc.c.bak	Wed Mar 28 12:04:03 2007
--- lib/netrc.c	Mon Apr 23 08:35:15 2007
***************
*** 35,40 ****
--- 35,43 ----
  #endif
  #ifdef VMS
  #include <unixlib.h>
+ #if defined(__INITIAL_POINTER_SIZE) && __INITIAL_POINTER_SIZE == 64
+ #define getpwuid __32_getpwuid
+ #endif
  #endif
  
  #include <curl/curl.h>