X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vms%2Fvmsish.h;h=8d2a628894627811d2ac5b24f2fa150b94f67819;hb=22d4bb9ccb8701e68f9243547d7e3a3c55f70908;hp=104eabce1eacef071d66501d7aa95cc924b02855;hpb=4b19af017623bfa3bb72bb164598a517f586e0d3;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/vms/vmsish.h b/vms/vmsish.h
index 104eabc..8d2a628 100644
--- a/vms/vmsish.h
+++ b/vms/vmsish.h
@@ -22,6 +22,9 @@
 #ifdef __DECC
 #  pragma message disable (ADDRCONSTEXT,NEEDCONSTEXT)
 #endif
+#ifdef __DECCXX 
+#  pragma message disable (ADDRCONSTEXT,NEEDCONSTEXT)
+#endif
 
 /* DEC's C compilers and gcc use incompatible definitions of _to(upp|low)er() */
 #ifdef _toupper
@@ -34,7 +37,7 @@
 #define _tolower(c) (((c) < 'A' || (c) > 'Z') ? (c) : (c) | 040)
 /* DECC 1.3 has a funny definition of abs; it's fixed in DECC 4.0, so this
  * can go away once DECC 1.3 isn't in use any more. */
-#if defined(__ALPHA) && defined(__DECC)
+#if defined(__ALPHA) && (defined(__DECC) || defined(__DECCXX))
 #undef abs
 #define abs(__x)        __ABS(__x)
 #undef labs
@@ -54,6 +57,9 @@
 #if defined(__DECC) && defined(__DECC_VER) && __DECC_VER > 20000000
 #  include <unistd.h> /* DECC has this; VAXC and gcc don't */
 #endif
+#ifdef __DECCXX 
+#  include <unistd.h> /* DECC has this; VAXC and gcc don't */
+#endif
 
 /* VAXC doesn't have a unary plus operator, so we need to get there indirectly */
 #if defined(VAXC) && !defined(__DECC)
@@ -473,7 +479,7 @@ struct utimbuf {
 #define ENVgetenv_len(v,l) my_getenv_len(v,l,FALSE)
 
 
-/* Thin jacket around cuserid() tomatch Unix' calling sequence */
+/* Thin jacket around cuserid() to match Unix' calling sequence */
 #define getlogin my_getlogin
 
 /* Ditto for sys$hash_passwrod() . . . */
@@ -539,7 +545,7 @@ struct passwd {
  * to map the unsigned int we want and the unsigned short[3] the CRTL
  * returns into the same member, since gcc has different ideas than DECC
  * and VAXC about sizing union types.
- * N.B 2. The routine cando() in vms.c assumes that &stat.st_ino is the
+ * N.B. 2. The routine cando() in vms.c assumes that &stat.st_ino is the
  * address of a FID.
  */
 /* First, grab the system types, so we don't clobber them later */
@@ -777,4 +783,6 @@ typedef char __VMS_SEPYTOTORP__;
 #  undef fileno 
 #endif 
 
+#define NO_ENVIRON_ARRAY
+
 #endif  /* __vmsish_h_included */