diff options
| -rw-r--r-- | ares/setup_once.h | 4 | ||||
| -rw-r--r-- | include/curl/curlbuild.h.dist | 20 | ||||
| -rw-r--r-- | lib/connect.c | 2 | ||||
| -rw-r--r-- | lib/curl_addrinfo.c | 6 | ||||
| -rw-r--r-- | lib/curl_addrinfo.h | 2 | ||||
| -rw-r--r-- | lib/ftp.c | 2 | ||||
| -rw-r--r-- | lib/getenv.c | 4 | ||||
| -rw-r--r-- | lib/hostares.c | 2 | ||||
| -rw-r--r-- | lib/hostasyn.c | 2 | ||||
| -rw-r--r-- | lib/hostip.c | 2 | ||||
| -rw-r--r-- | lib/hostip4.c | 2 | ||||
| -rw-r--r-- | lib/hostip6.c | 2 | ||||
| -rw-r--r-- | lib/hostsyn.c | 2 | ||||
| -rw-r--r-- | lib/hostthre.c | 2 | ||||
| -rw-r--r-- | lib/if2ip.c | 2 | ||||
| -rw-r--r-- | lib/imap.c | 2 | ||||
| -rw-r--r-- | lib/netrc.c | 4 | ||||
| -rw-r--r-- | lib/nonblock.c | 2 | ||||
| -rw-r--r-- | lib/pop3.c | 2 | ||||
| -rw-r--r-- | lib/setup.h | 2 | ||||
| -rw-r--r-- | lib/setup_once.h | 4 | ||||
| -rw-r--r-- | lib/smtp.c | 2 | ||||
| -rw-r--r-- | lib/ssh.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 2 | ||||
| -rw-r--r-- | src/getpass.c | 6 | ||||
| -rw-r--r-- | src/homedir.c | 8 | ||||
| -rw-r--r-- | src/main.c | 2 |
27 files changed, 47 insertions, 47 deletions
diff --git a/ares/setup_once.h b/ares/setup_once.h index f7d45a232..95722b2b7 100644 --- a/ares/setup_once.h +++ b/ares/setup_once.h @@ -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 * diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist index 9c3469ef4..0ee7135c5 100644 --- a/include/curl/curlbuild.h.dist +++ b/include/curl/curlbuild.h.dist @@ -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 diff --git a/lib/connect.c b/lib/connect.c index affb7fec5..ec3e43bd5 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -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 diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index 963335111..a5d26165c 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -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 diff --git a/lib/curl_addrinfo.h b/lib/curl_addrinfo.h index 2fbb47a68..a7235039f 100644 --- a/lib/curl_addrinfo.h +++ b/lib/curl_addrinfo.h @@ -38,7 +38,7 @@ # include <arpa/inet.h> #endif -#ifdef VMS +#ifdef __VMS # include <in.h> # include <inet.h> # include <stdlib.h> @@ -49,7 +49,7 @@ #ifdef HAVE_NETDB_H #include <netdb.h> #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #endif diff --git a/lib/getenv.c b/lib/getenv.c index 73fece24d..56c2cb771 100644 --- a/lib/getenv.c +++ b/lib/getenv.c @@ -27,7 +27,7 @@ #include <stdlib.h> #include <string.h> -#ifdef VMS +#ifdef __VMS #include <unixlib.h> #endif @@ -51,7 +51,7 @@ char *GetEnv(const char *variable) return (env[0] != '\0')?strdup(env):NULL; #else char *env = getenv(variable); -#ifdef VMS +#ifdef __VMS if(env && strcmp("HOME",variable) == 0) env = decc_translate_vms(env); #endif diff --git a/lib/hostares.c b/lib/hostares.c index 1412f13a6..8c1cb14fe 100644 --- a/lib/hostares.c +++ b/lib/hostares.c @@ -46,7 +46,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> /* for the close() proto */ #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #include <stdlib.h> diff --git a/lib/hostasyn.c b/lib/hostasyn.c index 8659e2fb2..715b0da4b 100644 --- a/lib/hostasyn.c +++ b/lib/hostasyn.c @@ -43,7 +43,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> /* for the close() proto */ #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #include <stdlib.h> diff --git a/lib/hostip.c b/lib/hostip.c index 26ed7b667..fc17de673 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -43,7 +43,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> /* for the close() proto */ #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #include <stdlib.h> diff --git a/lib/hostip4.c b/lib/hostip4.c index c10df461c..b4f6bd9d3 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -44,7 +44,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> /* for the close() proto */ #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #include <stdlib.h> diff --git a/lib/hostip6.c b/lib/hostip6.c index 972f84778..a5bc55ce0 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -43,7 +43,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> /* for the close() proto */ #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #include <stdlib.h> diff --git a/lib/hostsyn.c b/lib/hostsyn.c index 027d5fa1a..65d72256b 100644 --- a/lib/hostsyn.c +++ b/lib/hostsyn.c @@ -43,7 +43,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> /* for the close() proto */ #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #include <stdlib.h> diff --git a/lib/hostthre.c b/lib/hostthre.c index 2ff9c4a07..e41653b27 100644 --- a/lib/hostthre.c +++ b/lib/hostthre.c @@ -44,7 +44,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> /* for the close() proto */ #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #include <stdlib.h> diff --git a/lib/if2ip.c b/lib/if2ip.c index f0159457c..b8ed4c81c 100644 --- a/lib/if2ip.c +++ b/lib/if2ip.c @@ -53,7 +53,7 @@ #ifdef HAVE_STROPTS_H # include <stropts.h> #endif -#ifdef VMS +#ifdef __VMS # include <inet.h> #endif diff --git a/lib/imap.c b/lib/imap.c index 50201e151..fab6c4dde 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -52,7 +52,7 @@ #ifdef HAVE_NETDB_H #include <netdb.h> #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #endif diff --git a/lib/netrc.c b/lib/netrc.c index a543c34e2..a5dc8f408 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -33,7 +33,7 @@ #ifdef HAVE_PWD_H #include <pwd.h> #endif -#ifdef VMS +#ifdef __VMS #include <unixlib.h> #endif @@ -117,7 +117,7 @@ int Curl_parsenetrc(const char *host, struct passwd *pw; pw= getpwuid(geteuid()); if(pw) { -#ifdef VMS +#ifdef __VMS home = decc_translate_vms(pw->pw_dir); #else home = pw->pw_dir; diff --git a/lib/nonblock.c b/lib/nonblock.c index d5a32a9e2..c8f36e46a 100644 --- a/lib/nonblock.c +++ b/lib/nonblock.c @@ -42,7 +42,7 @@ #if (defined(HAVE_IOCTL_FIONBIO) && defined(NETWARE)) #include <sys/filio.h> #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #endif diff --git a/lib/pop3.c b/lib/pop3.c index 43549f791..24354504f 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -53,7 +53,7 @@ #ifdef HAVE_NETDB_H #include <netdb.h> #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #endif diff --git a/lib/setup.h b/lib/setup.h index 49d14ed09..8620f83b9 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -326,7 +326,7 @@ */ #ifndef SIZEOF_OFF_T -# if defined(__VMS) && (defined(__alpha) || defined(__ia64)) +# if defined(__VMS) && !defined(__VAX) # if defined(_LARGEFILE) # define SIZEOF_OFF_T 8 # endif diff --git a/lib/setup_once.h b/lib/setup_once.h index 9ad69e58d..5c49165f0 100644 --- a/lib/setup_once.h +++ b/lib/setup_once.h @@ -422,7 +422,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 @@ -432,7 +432,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 * diff --git a/lib/smtp.c b/lib/smtp.c index 44e405ed5..1bd869eb0 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -51,7 +51,7 @@ #ifdef HAVE_NETDB_H #include <netdb.h> #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #endif @@ -66,7 +66,7 @@ #ifdef HAVE_NETDB_H #include <netdb.h> #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #endif @@ -65,7 +65,7 @@ #include <sys/param.h> #endif -#ifdef VMS +#ifdef __VMS #include <in.h> #include <inet.h> #endif diff --git a/src/getpass.c b/src/getpass.c index 8d20eb48c..a46d8e30d 100644 --- a/src/getpass.c +++ b/src/getpass.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -54,7 +54,7 @@ #include "memdebug.h" #endif -#ifdef VMS +#ifdef __VMS /* VMS implementation */ #include descrip #include starlet @@ -93,7 +93,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) return buffer; /* we always return success */ } #define DONE -#endif /* VMS */ +#endif /* __VMS */ #ifdef WIN32 diff --git a/src/homedir.c b/src/homedir.c index e8392f192..e2fbc7a3a 100644 --- a/src/homedir.c +++ b/src/homedir.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -33,7 +33,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef VMS +#ifdef __VMS #include <unixlib.h> #endif @@ -68,7 +68,7 @@ char *GetEnv(const char *variable, char do_expand) } #else (void)do_expand; -#ifdef VMS +#ifdef __VMS env = getenv(variable); if (env && strcmp("HOME",variable) == 0) { env = decc_translate_vms(env); @@ -99,7 +99,7 @@ char *homedir(void) struct passwd *pw = getpwuid(geteuid()); if (pw) { -#ifdef VMS +#ifdef __VMS home = decc_translate_vms(pw->pw_dir); #else home = pw->pw_dir; diff --git a/src/main.c b/src/main.c index f7c2eb43e..a4b858b55 100644 --- a/src/main.c +++ b/src/main.c @@ -277,7 +277,7 @@ typedef enum { */ #ifndef SIZEOF_OFF_T -# if defined(__VMS) && (defined(__alpha) || defined(__ia64)) +# if defined(__VMS) && !defined(__VAX) # if defined(_LARGEFILE) # define SIZEOF_OFF_T 8 # endif |