diff options
| author | Erlend Egeberg Aasland <erlend.aasland@innova.no> | 2021-03-13 16:33:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-13 17:33:39 +0200 |
| commit | 2256a2876b5214a5a7492bf78bd86cf8beb690bf (patch) | |
| tree | 6cd58f558204fbf45306c2734abeb784cdcf9c3a | |
| parent | 75048c8a38005845f10f8cb1dd33a31e0052cae0 (diff) | |
| download | cpython-git-2256a2876b5214a5a7492bf78bd86cf8beb690bf.tar.gz | |
bpo-43444: Move sqlite3 MODULE_NAME from setup.py to module.h (GH-24801)
| -rw-r--r-- | Modules/_sqlite/cache.h | 3 | ||||
| -rw-r--r-- | Modules/_sqlite/module.h | 1 | ||||
| -rw-r--r-- | Modules/_sqlite/prepare_protocol.h | 3 | ||||
| -rw-r--r-- | PCbuild/_sqlite3.vcxproj | 1 | ||||
| -rw-r--r-- | setup.py | 5 |
5 files changed, 3 insertions, 10 deletions
diff --git a/Modules/_sqlite/cache.h b/Modules/_sqlite/cache.h index 4a1977fcd2..083356f93f 100644 --- a/Modules/_sqlite/cache.h +++ b/Modules/_sqlite/cache.h @@ -23,8 +23,7 @@ #ifndef PYSQLITE_CACHE_H #define PYSQLITE_CACHE_H -#define PY_SSIZE_T_CLEAN -#include "Python.h" +#include "module.h" /* The LRU cache is implemented as a combination of a doubly-linked with a * dictionary. The list items are of type 'Node' and the dictionary has the diff --git a/Modules/_sqlite/module.h b/Modules/_sqlite/module.h index 3185ec9788..9aede92ea3 100644 --- a/Modules/_sqlite/module.h +++ b/Modules/_sqlite/module.h @@ -27,6 +27,7 @@ #include "Python.h" #define PYSQLITE_VERSION "2.6.0" +#define MODULE_NAME "sqlite3" extern PyObject* pysqlite_Error; extern PyObject* pysqlite_Warning; diff --git a/Modules/_sqlite/prepare_protocol.h b/Modules/_sqlite/prepare_protocol.h index 42d07cbe9f..593961331c 100644 --- a/Modules/_sqlite/prepare_protocol.h +++ b/Modules/_sqlite/prepare_protocol.h @@ -23,8 +23,7 @@ #ifndef PYSQLITE_PREPARE_PROTOCOL_H #define PYSQLITE_PREPARE_PROTOCOL_H -#define PY_SSIZE_T_CLEAN -#include "Python.h" +#include "module.h" typedef struct { diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj index 7e0062692b..5eb8559d29 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -94,7 +94,6 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>MODULE_NAME="sqlite3";%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemGroup> @@ -1571,12 +1571,7 @@ class PyBuildExt(build_ext): '_sqlite/row.c', '_sqlite/statement.c', '_sqlite/util.c', ] - sqlite_defines = [] - if not MS_WINDOWS: - sqlite_defines.append(('MODULE_NAME', '"sqlite3"')) - else: - sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"')) # Enable support for loadable extensions in the sqlite3 module # if --enable-loadable-sqlite-extensions configure option is used. |