From 9d57828d66fb86d4e0989862c9c04188c45bb527 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sun, 20 Mar 2011 13:15:37 +0000
Subject: * apps/openssl.c: For VMS, take care of copying argv if needed much
 earlier,   directly in main().  'if needed' also includes when argv is a 32
 bit   pointer in an otherwise 64 bit environment. * apps/makeapps.com: When
 using /POINTER_SIZE=64, try to use the additional   =ARGV, but only if it's
 supported.  Fortunately, DCL is very helpful   telling us in this case.

---
 apps/makeapps.com | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'apps/makeapps.com')

diff --git a/apps/makeapps.com b/apps/makeapps.com
index 4b33f68af0..9611a48bb1 100644
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -599,7 +599,27 @@ $     POINTER_SIZE = "/POINTER_SIZE=32"
 $   ELSE
 $     IF (P6 .EQS. "64")
 $     THEN
-$       POINTER_SIZE = "/POINTER_SIZE=64=ARGV"
+$       POINTER_SIZE = "/POINTER_SIZE=64"
+$	SET NOON
+$	DEFINE /USER SYS$OUTPUT NL:
+$	DEFINE /USER SYS$ERROR NL:
+$	CC /POINTER_SIZE=64=ARGV NL:
+$	IF ($STATUS .AND. %X0FFF0000) .EQ. %X00030000
+$	THEN
+$	  ! If we got here, it means DCL complained like this:
+$	  ! %DCL-W-NOVALU, value not allowed - remove value specification
+$	  !  \64=\
+$	  !
+$	  ! If the compiler was run, logicals defined in /USER would
+$	  ! have been deassigned automatically.  However, when DCL
+$	  ! complains, they aren't, so we do it here (it might be
+$	  ! unnecessary, but just in case there will be another error
+$	  ! message further on that we don't want to miss)
+$	  DEASSIGN/USER SYS$ERROR
+$	  DEASSIGN/USER SYS$OUTPUT
+$	ELSE
+$	  POINTER_SIZE = POINTER_SIZE + "=ARGV"
+$	ENDIF
 $       ARCHD = ARCH+ "_64"
 $       LIB32 = ""
 $     ELSE
-- 
cgit v1.2.3