Skip to content

Commit f35e7d3

Browse files
closes bpo-39953: Generate ifdefs around library code definitions. (GH-19490)
(cherry picked from commit 909b87d) Co-authored-by: Benjamin Peterson <[email protected]>
1 parent 6151148 commit f35e7d3

File tree

2 files changed

+55
-1
lines changed

2 files changed

+55
-1
lines changed

Modules/_ssl_data.h

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,85 @@
11
/* File generated by Tools/ssl/make_ssl_data.py */
2-
/* Generated on 2020-04-11T14:59:43.709585 */
2+
/* Generated on 2020-04-12T13:38:13.871723 */
33

44
static struct py_ssl_library_code library_codes[] = {
5+
#ifdef ERR_LIB_ASN1
56
{"ASN1", ERR_LIB_ASN1},
7+
#endif
8+
#ifdef ERR_LIB_ASYNC
69
{"ASYNC", ERR_LIB_ASYNC},
10+
#endif
11+
#ifdef ERR_LIB_BIO
712
{"BIO", ERR_LIB_BIO},
13+
#endif
14+
#ifdef ERR_LIB_BN
815
{"BN", ERR_LIB_BN},
16+
#endif
17+
#ifdef ERR_LIB_CMS
918
{"CMS", ERR_LIB_CMS},
19+
#endif
20+
#ifdef ERR_LIB_COMP
1021
{"COMP", ERR_LIB_COMP},
22+
#endif
23+
#ifdef ERR_LIB_CONF
1124
{"CONF", ERR_LIB_CONF},
25+
#endif
26+
#ifdef ERR_LIB_CRYPTO
1227
{"CRYPTO", ERR_LIB_CRYPTO},
28+
#endif
29+
#ifdef ERR_LIB_CT
1330
{"CT", ERR_LIB_CT},
31+
#endif
32+
#ifdef ERR_LIB_DH
1433
{"DH", ERR_LIB_DH},
34+
#endif
35+
#ifdef ERR_LIB_DSA
1536
{"DSA", ERR_LIB_DSA},
37+
#endif
38+
#ifdef ERR_LIB_EC
1639
{"EC", ERR_LIB_EC},
40+
#endif
41+
#ifdef ERR_LIB_ENGINE
1742
{"ENGINE", ERR_LIB_ENGINE},
43+
#endif
44+
#ifdef ERR_LIB_EVP
1845
{"EVP", ERR_LIB_EVP},
46+
#endif
47+
#ifdef ERR_LIB_KDF
1948
{"KDF", ERR_LIB_KDF},
49+
#endif
50+
#ifdef ERR_LIB_OCSP
2051
{"OCSP", ERR_LIB_OCSP},
52+
#endif
53+
#ifdef ERR_LIB_PEM
2154
{"PEM", ERR_LIB_PEM},
55+
#endif
56+
#ifdef ERR_LIB_PKCS12
2257
{"PKCS12", ERR_LIB_PKCS12},
58+
#endif
59+
#ifdef ERR_LIB_PKCS7
2360
{"PKCS7", ERR_LIB_PKCS7},
61+
#endif
62+
#ifdef ERR_LIB_RAND
2463
{"RAND", ERR_LIB_RAND},
64+
#endif
65+
#ifdef ERR_LIB_RSA
2566
{"RSA", ERR_LIB_RSA},
67+
#endif
68+
#ifdef ERR_LIB_SSL
2669
{"SSL", ERR_LIB_SSL},
70+
#endif
71+
#ifdef ERR_LIB_TS
2772
{"TS", ERR_LIB_TS},
73+
#endif
74+
#ifdef ERR_LIB_UI
2875
{"UI", ERR_LIB_UI},
76+
#endif
77+
#ifdef ERR_LIB_X509
2978
{"X509", ERR_LIB_X509},
79+
#endif
80+
#ifdef ERR_LIB_X509V3
3081
{"X509V3", ERR_LIB_X509V3},
82+
#endif
3183
{ NULL }
3284
};
3385

Tools/ssl/make_ssl_data.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ def w(l):
7676

7777
w("static struct py_ssl_library_code library_codes[] = {")
7878
for mnemo, (libcode, _, _) in sorted(error_libraries.items()):
79+
w(f'#ifdef {libcode}')
7980
w(' {"%s", %s},' % (mnemo, libcode))
81+
w('#endif')
8082
w(' { NULL }')
8183
w('};')
8284
w("")

0 commit comments

Comments
 (0)