From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 17 Oct 2001 21:48:24 +0000 (+0000)
Subject: (retracted by #12485)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=de0140600048fd6e09877d61a3fc7a94bb7c0a8f;p=p5sagit%2Fp5-mst-13.2.git

(retracted by #12485)
Move the VMS_FOO_ERROR codes next to the SETERRNO() definition.

p4raw-id: //depot/perl@12483
---

diff --git a/perl.h b/perl.h
index c3baf1f..d37851c 100644
--- a/perl.h
+++ b/perl.h
@@ -695,6 +695,35 @@ int sockatmark(int);
 #   define SETERRNO(errcode,vmserrcode) (errno = (errcode))
 #endif
 
+/* These definitions are sneaky.
+ * Their only purpose is to avoid warnings on strict ANSI (non-VMS)
+ * compilers which can get huffy about dollars in identifiers,
+ * which is common practise in VMS.  The definitions in the
+ * non-VMS branch are not used (since the VMS error code is
+ * unsurprisingly not of much use in non-VMS) -- but their only
+ * point is to be something non-dollared.  Neither are all instances
+ * of dollared variables hidden this way, only at the spots where
+ * non-VMS platforms see them. */
+#ifdef VMS
+#define VMS_LIB_INVARGV	LIB$_INVARG
+#define VMS_RMS_DIR	RMS$_DIR
+#define VMS_RMS_FAC	RMS$_FAC
+#define VMS_RMS_IFI	RMS$_IFI
+#define VMS_RMS_ISI	RMS$_ISI
+#define VMS_SS_ACCVIO	SS$_ACCVIO
+#define VMS_SS_IVCHAN	SS$_IVCHAN
+#define VMS_SS_NORMAL	SS$_NORMAL
+#else
+#define VMS_LIB_INVARG	EINVAL
+#define VMS_RMS_DIR	EBADF
+#define VMS_RMS_FAC	0
+#define VMS_RMS_IFI	EBADF
+#define VMS_RMS_ISI	EBADF
+#define VMS_SS_ACCVIO	EFAULT
+#define VMS_SS_IVCHAN	EBADF
+#define VMS_SS_NORMAL	0
+#endif
+
 #ifdef USE_5005THREADS
 #  define ERRSV (thr->errsv)
 #  define DEFSV THREADSV(0)
@@ -3926,32 +3955,4 @@ extern void moncontrol(int);
 #include "wince.h"
 #endif
 
-/* These definitions are sneaky.
- * Their only purpose is to avoid warnings on strict ANSI (non-VMS)
- * compilers which get huffy about dollars in identifiers,
- * which is common practise in VMS.  The definitions in the
- * non-VMS branch are not used -- but their only point is to
- * be something non-dollared.  Neither are all instances of
- * dollared variables hidden this way, only at the spots where
- * non-VMS platforms see them. */
-#ifdef VMS
-#define VMS_LIB_INVARGV	LIB$_INVARG
-#define VMS_RMS_DIR	RMS$_DIR
-#define VMS_RMS_FAC	RMS$_FAC
-#define VMS_RMS_IFI	RMS$_IFI
-#define VMS_RMS_ISI	RMS$_ISI
-#define VMS_SS_ACCVIO	SS$_ACCVIO
-#define VMS_SS_IVCHAN	SS$_IVCHAN
-#define VMS_SS_NORMAL	SS$_NORMAL
-#else
-#define VMS_LIB_INVARG	EINVAL
-#define VMS_RMS_DIR	EBADF
-#define VMS_RMS_FAC	0
-#define VMS_RMS_IFI	EBADF
-#define VMS_RMS_ISI	EBADF
-#define VMS_SS_ACCVIO	EFAULT
-#define VMS_SS_IVCHAN	EBADF
-#define VMS_SS_NORMAL	0
-#endif
-
 #endif /* Include guard */