diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2019-10-15 07:26:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 07:26:12 (GMT) |
| commit | 0b60f64e4343913b4931dc27379d9808e5b78fe1 (patch) | |
| tree | 197eeeff16c9146b5040bed69d1e0d95c5fdc87b /Modules | |
| parent | 4d202281c128e2026e78fc5f4cc752b1dafbf3ad (diff) | |
| download | cpython-0b60f64e4343913b4931dc27379d9808e5b78fe1.zip cpython-0b60f64e4343913b4931dc27379d9808e5b78fe1.tar.gz cpython-0b60f64e4343913b4931dc27379d9808e5b78fe1.tar.bz2 | |
bpo-11410: Standardize and use symbol visibility attributes across POSIX and Windows. (GH-16347)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ctypes/_ctypes_test.c | 6 | ||||
| -rw-r--r-- | Modules/_io/_iomodule.h | 4 | ||||
| -rw-r--r-- | Modules/_io/bytesio.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c index 8a0e5e9..40da652 100644 --- a/Modules/_ctypes/_ctypes_test.c +++ b/Modules/_ctypes/_ctypes_test.c @@ -4,11 +4,7 @@ #include <windows.h> #endif -#if defined(MS_WIN32) || defined(__CYGWIN__) -#define EXPORT(x) __declspec(dllexport) x -#else -#define EXPORT(x) x -#endif +#define EXPORT(x) Py_EXPORTED_SYMBOL x /* some functions handy for testing */ diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h index 4d318ac..a8f3951 100644 --- a/Modules/_io/_iomodule.h +++ b/Modules/_io/_iomodule.h @@ -2,6 +2,8 @@ * Declarations shared between the different parts of the io module */ +#include "exports.h" + /* ABCs */ extern PyTypeObject PyIOBase_Type; extern PyTypeObject PyRawIOBase_Type; @@ -183,4 +185,4 @@ extern PyObject *_PyIO_str_write; extern PyObject *_PyIO_empty_str; extern PyObject *_PyIO_empty_bytes; -extern PyTypeObject _PyBytesIOBuffer_Type; +extern Py_EXPORTED_SYMBOL PyTypeObject _PyBytesIOBuffer_Type; diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index a5f4c47..b5d308a 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -1124,7 +1124,7 @@ static PyBufferProcs bytesiobuf_as_buffer = { (releasebufferproc) bytesiobuf_releasebuffer, }; -PyTypeObject _PyBytesIOBuffer_Type = { +Py_EXPORTED_SYMBOL PyTypeObject _PyBytesIOBuffer_Type = { PyVarObject_HEAD_INIT(NULL, 0) "_io._BytesIOBuffer", /*tp_name*/ sizeof(bytesiobuf), /*tp_basicsize*/ |