summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-12-30 17:59:56 +0000
committerYang Tse <yangsita@gmail.com>2009-12-30 17:59:56 +0000
commit3184a91ec86b2f35f16a8e11e2daa03fac8e91b6 (patch)
tree1f9a39c4001243eae8b7b45f98951502a51fea0d /src
parent0dde9056d7c21dd9ad0afcb8fe2f4ec2408acf10 (diff)
downloadcurl-3184a91ec86b2f35f16a8e11e2daa03fac8e91b6.tar.gz
VMS specific preprocessor symbol checking adjustments
Diffstat (limited to 'src')
-rw-r--r--src/getpass.c6
-rw-r--r--src/homedir.c8
-rw-r--r--src/main.c2
3 files changed, 8 insertions, 8 deletions
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