summaryrefslogtreecommitdiffstats
path: root/util/perl
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2019-07-01 16:24:08 -0400
committerRich Salz <rsalz@akamai.com>2019-07-01 20:13:03 -0400
commit211da00b79f5ab9df62f69ddff65d493759eae4c (patch)
treede20393740a5eb220900bf14ef82a9dd86a46d0b /util/perl
parent66e2dbc01cb20b267bf132c945f49c303f63d7c4 (diff)
Remove EXPORT_VAR_AS_FUNC
We only export functions, not global, so remove the config option and some of the #ifdef stuff. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/9285)
Diffstat (limited to 'util/perl')
-rw-r--r--util/perl/OpenSSL/Ordinals.pm2
-rw-r--r--util/perl/OpenSSL/ParseC.pm4
2 files changed, 0 insertions, 6 deletions
diff --git a/util/perl/OpenSSL/Ordinals.pm b/util/perl/OpenSSL/Ordinals.pm
index c26a866493..302d58f8b1 100644
--- a/util/perl/OpenSSL/Ordinals.pm
+++ b/util/perl/OpenSSL/Ordinals.pm
@@ -342,8 +342,6 @@ sub _parse_platforms {
# if ($def =~ m{^__DragonFly__$}) { $platforms{$&} = $op; }
# if ($def =~ m{^__OpenBSD__$}) { $platforms{$&} = $op; }
# if ($def =~ m{^__NetBSD__$}) { $platforms{$&} = $op; }
- if ($def =~
- m{^OPENSSL_(EXPORT_VAR_AS_FUNCTION)$}) { $platforms{$1} = $op; }
if ($def =~ m{^OPENSSL_SYS_}) { $platforms{$'} = $op; }
}
diff --git a/util/perl/OpenSSL/ParseC.pm b/util/perl/OpenSSL/ParseC.pm
index 8e5b8b2e0a..286fa7e0ef 100644
--- a/util/perl/OpenSSL/ParseC.pm
+++ b/util/perl/OpenSSL/ParseC.pm
@@ -400,11 +400,7 @@ EOF
{ regexp => qr/DECLARE_ASN1_ITEM<<<\((.*)\)>>>/,
massager => sub {
return (<<"EOF");
-#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-OPENSSL_EXTERN const ASN1_ITEM *$1_it;
-#else
const ASN1_ITEM *$1_it(void);
-#endif
EOF
},
},