[Python-checkins] add 'extern' to pygetopt.h symbols, so then don't end up in comdat (#4909)
Benjamin Peterson
webhook-mailer at python.org
Sun Dec 17 13:34:02 EST 2017
https://github.com/python/cpython/commit/4c72bc4a38eced10a55ba7071e084b26a2b5ed4b
commit: 4c72bc4a38eced10a55ba7071e084b26a2b5ed4b
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2017-12-17T10:34:00-08:00
summary:
add 'extern' to pygetopt.h symbols, so then don't end up in comdat (#4909)
bpo-32264
files:
M Include/internal/pygetopt.h
diff --git a/Include/internal/pygetopt.h b/Include/internal/pygetopt.h
index df6f18354ee..8ef2ada72fe 100644
--- a/Include/internal/pygetopt.h
+++ b/Include/internal/pygetopt.h
@@ -1,11 +1,11 @@
#ifndef Py_INTERNAL_PYGETOPT_H
#define Py_INTERNAL_PYGETOPT_H
-int _PyOS_opterr;
-int _PyOS_optind;
-wchar_t *_PyOS_optarg;
+extern int _PyOS_opterr;
+extern int _PyOS_optind;
+extern wchar_t *_PyOS_optarg;
-void _PyOS_ResetGetOpt(void);
+extern void _PyOS_ResetGetOpt(void);
typedef struct {
const wchar_t *name;
@@ -13,7 +13,7 @@ typedef struct {
int val;
} _PyOS_LongOption;
-int _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring,
- const _PyOS_LongOption *longopts, int *longindex);
+extern int _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring,
+ const _PyOS_LongOption *longopts, int *longindex);
#endif /* !Py_INTERNAL_PYGETOPT_H */
More information about the Python-checkins
mailing list