More VMS patches from Peter Prymmer.

[p5sagit/p5-mst-13.2.git] / vms / vmsish.h

diff --git a/vms/vmsish.h b/vms/vmsish.h
index 709e34e..e9b47a0 100644 (file)
--- a/vms/vmsish.h
+++ b/vms/vmsish.h
@@ -75,8 +75,8 @@
   /* getenv used for regular logical names */
 #  define getenv(v) my_getenv(v,TRUE)
 #endif
-#if defined(getenv_len)
-#undef getenv_len
+#ifdef getenv_len
+#  undef getenv_len
 #endif
 #define getenv_len(v,l) my_getenv_len(v,l,TRUE)
 
@@ -93,11 +93,16 @@
 /* Our own contribution to PerlShr's global symbols . . . */
 #define vmstrnenv              Perl_vmstrnenv
 #define my_trnlnm              Perl_my_trnlnm
-#define my_getenv              Perl_my_getenv
 #define my_getenv_len          Perl_my_getenv_len
 #define prime_env_iter Perl_prime_env_iter
 #define vmssetenv              Perl_vmssetenv
+#if !defined(PERL_IMPLICIT_CONTEXT)
 #define my_setenv              Perl_my_setenv
+#define my_getenv              Perl_my_getenv
+#else
+#define my_setenv(a,b)         Perl_my_setenv(aTHX_ a,b)
+#define my_getenv(a,b)         Perl_my_getenv(aTHX_ a,b)
+#endif
 #define my_crypt               Perl_my_crypt
 #define my_waitpid             Perl_my_waitpid
 #define my_gconvert            Perl_my_gconvert
@@ -225,7 +230,7 @@
 #define _ckvmssts(call) STMT_START { register unsigned long int __ckvms_sts; \
   if (!((__ckvms_sts=(call))&1)) { \
   set_errno(EVMSERR); set_vaxc_errno(__ckvms_sts); \
-  croak("Fatal VMS error (status=%d) at %s, line %d", \
+  Perl_croak(aTHX_ "Fatal VMS error (status=%d) at %s, line %d", \
   __ckvms_sts,__FILE__,__LINE__); } } STMT_END
 
 /* Same thing, but don't call back to Perl's croak(); useful for errors
@@ -247,6 +252,8 @@
 #define HAS_KILL
 #define HAS_WAIT
 
+#define PERL_FS_VER_FMT                "%d_%d_%d"
+
 /* VMS:
  *     This symbol, if defined, indicates that the program is running under
  *     VMS.  It's a symbol automagically defined by all VMS C compilers I've seen.
@@ -584,7 +591,11 @@ void       init_os_extras ();
 typedef char  __VMS_PROTOTYPES__;
 int    vmstrnenv (const char *, char *, unsigned long int, struct dsc$descriptor_s **, unsigned long int);
 int    my_trnlnm (const char *, char *, unsigned long int);
-char * my_getenv (const char *, bool);
+#if !defined(PERL_IMPLICIT_CONTEXT)
+char * Perl_my_getenv (const char *, bool);
+#else
+char * Perl_my_getenv (pTHX_ const char *, bool);
+#endif
 char * my_getenv_len (const char *, unsigned long *, bool);
 int    vmssetenv (char *, char *, struct dsc$descriptor_s **);
 char * my_crypt (const char *, const char *);
@@ -626,7 +637,7 @@ int     my_sigdelset   (sigset_t *, int);
 int     my_sigismember (sigset_t *, int);
 int     my_sigprocmask (int, sigset_t *, sigset_t *);
 #endif
-I32    cando_by_name (I32, I32, char *);
+I32    cando_by_name (I32, Uid_t, char *);
 int    flex_fstat (int, Stat_t *);
 int    flex_stat (const char *, Stat_t *);
 int    trim_unixpath (char *, char*, int);
@@ -672,6 +683,4 @@ typedef char __VMS_SEPYTOTORP__;
 #undef HAS_NTOHL
 #endif
 
-#define TMPPATH "sys$scratch:perl-eXXXXXX"
-
 #endif  /* __vmsish_h_included */