From: Richard Levitte <levitte@openssl.org>
Date: Fri, 7 Oct 2022 08:23:17 +0000 (+0200)
Subject: Fix crypto/dso/dso_vms.c
X-Git-Tag: openssl-3.2.0-alpha1~1956
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c007f466aaebd8ef07111c8560e039d8bcb5fa7b;p=thirdparty%2Fopenssl.git

Fix crypto/dso/dso_vms.c

In the "Stop raising ERR_R_MALLOC_FAILURE in most places" commit, some
fixes of this file weren't done quite right, leading to a symbol being
undeclared depending on building circumstances.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/19360)
---

diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 1afa222dbc9..236b1924d40 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -106,9 +106,12 @@ static int vms_load(DSO *dso)
 #   pragma pointer_size save
 #   pragma pointer_size 32
 #  endif                        /* __INITIAL_POINTER_SIZE == 64 */
+# endif                         /* __INITIAL_POINTER_SIZE && defined
+                                 * _ANSI_C_SOURCE */
 
     DSO_VMS_INTERNAL *p = NULL;
 
+# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
 #  if __INITIAL_POINTER_SIZE == 64
 #   pragma pointer_size restore
 #  endif                        /* __INITIAL_POINTER_SIZE == 64 */