VMS: remove name mangling guards around inclusion of internals
authorRichard Levitte <levitte@openssl.org>
Thu, 20 Apr 2017 09:16:40 +0000 (11:16 +0200)
committerRichard Levitte <levitte@openssl.org>
Thu, 20 Apr 2017 11:10:06 +0000 (13:10 +0200)
Note that these guards are still needed around local header files that
declare linkable symbols.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3259)

test/asn1_internal_test.c
test/chacha_internal_test.c
test/cipher_overhead_test.c
test/poly1305_internal_test.c
test/siphash_internal_test.c

index 6dc8a11..f936098 100644 (file)
@@ -59,17 +59,7 @@ static int test_tbl_standard()
  *
  ***/
 
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/asn1_int.h"
-
-#ifdef __VMS
-# pragma names restore
-#endif
-
 #include "../crypto/asn1/standard_methods.h"
 
 static int test_standard_methods()
index 1c8d90a..0c0be9b 100644 (file)
 #include <openssl/opensslconf.h>
 #include "test_main.h"
 #include "testutil.h"
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/chacha.h"
 
-#ifdef __VMS
-# pragma names restore
-#endif
-
 const static unsigned int key[] = {
     0x03020100, 0x07060504, 0x0b0a0908, 0x0f0e0d0c,
     0x13121110, 0x17161514, 0x1b1a1918, 0x1f1e1d1c
index 5ddd21c..98d44bd 100644 (file)
 #include "testutil.h"
 #include "test_main.h"
 
+#ifdef __VMS
+# pragma names save
+# pragma names as_is,shortened
+#endif
+
 #include "../ssl/ssl_locl.h"
 
+#ifdef __VMS
+# pragma names restore
+#endif
+
 static int cipher_overhead(void)
 {
     int ret = 1, i, n = ssl3_num_ciphers();
index 1ede874..03b0fa9 100644 (file)
 
 #include "testutil.h"
 #include "test_main_custom.h"
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/poly1305.h"
-
-#ifdef __VMS
-# pragma names restore
-#endif
-
 #include "../crypto/poly1305/poly1305_local.h"
 #include "e_os.h"
 
index 2df7f39..fd097e0 100644 (file)
 #include <openssl/bio.h>
 #include "testutil.h"
 #include "test_main_custom.h"
-
-#ifdef __VMS
-# pragma names save
-# pragma names as_is,shortened
-#endif
-
 #include "internal/siphash.h"
-
-#ifdef __VMS
-# pragma names restore
-#endif
-
 #include "../crypto/siphash/siphash_local.h"
 #include "e_os.h"