Regen darwin config
Test: build on a mac
Change-Id: Icfa562808d4dc56e2eba49690f9490e234743d28
diff --git a/android/darwin_x86_64/config.c b/android/darwin_x86_64/config.c
index 1d4b0d9..9b1e182 100644
--- a/android/darwin_x86_64/config.c
+++ b/android/darwin_x86_64/config.c
@@ -98,6 +98,7 @@
extern PyObject* PyInit__tracemalloc(void);
extern PyObject* PyInit__symtable(void);
extern PyObject* PyInit_xxsubtype(void);
+
/* -- ADDMODULE MARKER 1 -- */
extern PyObject* PyMarshal_Init(void);
@@ -109,81 +110,82 @@
struct _inittab _PyImport_Inittab[] = {
-{"_posixshmem", PyInit__posixshmem},
-{"_scproxy", PyInit__scproxy},
-{"array", PyInit_array},
-{"cmath", PyInit_cmath},
-{"math", PyInit_math},
-{"_contextvars", PyInit__contextvars},
-{"time", PyInit_time},
-{"_datetime", PyInit__datetime},
-{"_random", PyInit__random},
-{"_bisect", PyInit__bisect},
-{"_heapq", PyInit__heapq},
-{"_pickle", PyInit__pickle},
-{"atexit", PyInit_atexit},
-{"_json", PyInit__json},
-{"_lsprof", PyInit__lsprof},
-{"unicodedata", PyInit_unicodedata},
-{"_opcode", PyInit__opcode},
-{"_asyncio", PyInit__asyncio},
-{"_abc", PyInit__abc},
-{"_queue", PyInit__queue},
-{"_statistics", PyInit__statistics},
-{"fcntl", PyInit_fcntl},
-{"pwd", PyInit_pwd},
-{"grp", PyInit_grp},
-{"select", PyInit_select},
-{"parser", PyInit_parser},
-{"mmap", PyInit_mmap},
-{"syslog", PyInit_syslog},
-{"_xxsubinterpreters", PyInit__xxsubinterpreters},
-{"_csv", PyInit__csv},
-{"_posixsubprocess", PyInit__posixsubprocess},
-{"_socket", PyInit__socket},
-{"termios", PyInit_termios},
-{"resource", PyInit_resource},
-{"zlib", PyInit_zlib},
-{"binascii", PyInit_binascii},
-{"pyexpat", PyInit_pyexpat},
-{"_multibytecodec", PyInit__multibytecodec},
-{"_codecs_kr", PyInit__codecs_kr},
-{"_codecs_jp", PyInit__codecs_jp},
-{"_codecs_cn", PyInit__codecs_cn},
-{"_codecs_tw", PyInit__codecs_tw},
-{"_codecs_hk", PyInit__codecs_hk},
-{"_codecs_iso2022", PyInit__codecs_iso2022},
-{"_multiprocessing", PyInit__multiprocessing},
-{"_ctypes", PyInit__ctypes},
-{"_blake2", PyInit__blake2},
-{"_md5", PyInit__md5},
-{"_sha1", PyInit__sha1},
-{"_sha256", PyInit__sha256},
-{"_sha512", PyInit__sha512},
-{"_sha3", PyInit__sha3},
-{"_struct", PyInit__struct},
-{"posix", PyInit_posix},
-{"errno", PyInit_errno},
-{"pwd", PyInit_pwd},
-{"_sre", PyInit__sre},
-{"_codecs", PyInit__codecs},
-{"_weakref", PyInit__weakref},
-{"_functools", PyInit__functools},
-{"_operator", PyInit__operator},
-{"_collections", PyInit__collections},
-{"_abc", PyInit__abc},
-{"itertools", PyInit_itertools},
-{"atexit", PyInit_atexit},
-{"_signal", PyInit__signal},
-{"_stat", PyInit__stat},
-{"time", PyInit_time},
-{"_thread", PyInit__thread},
-{"_locale", PyInit__locale},
-{"_io", PyInit__io},
-{"faulthandler", PyInit_faulthandler},
-{"_tracemalloc", PyInit__tracemalloc},
-{"_symtable", PyInit__symtable},
-{"xxsubtype", PyInit_xxsubtype},
+ {"_posixshmem", PyInit__posixshmem},
+ {"_scproxy", PyInit__scproxy},
+ {"array", PyInit_array},
+ {"cmath", PyInit_cmath},
+ {"math", PyInit_math},
+ {"_contextvars", PyInit__contextvars},
+ {"time", PyInit_time},
+ {"_datetime", PyInit__datetime},
+ {"_random", PyInit__random},
+ {"_bisect", PyInit__bisect},
+ {"_heapq", PyInit__heapq},
+ {"_pickle", PyInit__pickle},
+ {"atexit", PyInit_atexit},
+ {"_json", PyInit__json},
+ {"_lsprof", PyInit__lsprof},
+ {"unicodedata", PyInit_unicodedata},
+ {"_opcode", PyInit__opcode},
+ {"_asyncio", PyInit__asyncio},
+ {"_abc", PyInit__abc},
+ {"_queue", PyInit__queue},
+ {"_statistics", PyInit__statistics},
+ {"fcntl", PyInit_fcntl},
+ {"pwd", PyInit_pwd},
+ {"grp", PyInit_grp},
+ {"select", PyInit_select},
+ {"parser", PyInit_parser},
+ {"mmap", PyInit_mmap},
+ {"syslog", PyInit_syslog},
+ {"_xxsubinterpreters", PyInit__xxsubinterpreters},
+ {"_csv", PyInit__csv},
+ {"_posixsubprocess", PyInit__posixsubprocess},
+ {"_socket", PyInit__socket},
+ {"termios", PyInit_termios},
+ {"resource", PyInit_resource},
+ {"zlib", PyInit_zlib},
+ {"binascii", PyInit_binascii},
+ {"pyexpat", PyInit_pyexpat},
+ {"_multibytecodec", PyInit__multibytecodec},
+ {"_codecs_kr", PyInit__codecs_kr},
+ {"_codecs_jp", PyInit__codecs_jp},
+ {"_codecs_cn", PyInit__codecs_cn},
+ {"_codecs_tw", PyInit__codecs_tw},
+ {"_codecs_hk", PyInit__codecs_hk},
+ {"_codecs_iso2022", PyInit__codecs_iso2022},
+ {"_multiprocessing", PyInit__multiprocessing},
+ {"_ctypes", PyInit__ctypes},
+ {"_blake2", PyInit__blake2},
+ {"_md5", PyInit__md5},
+ {"_sha1", PyInit__sha1},
+ {"_sha256", PyInit__sha256},
+ {"_sha512", PyInit__sha512},
+ {"_sha3", PyInit__sha3},
+ {"_struct", PyInit__struct},
+ {"posix", PyInit_posix},
+ {"errno", PyInit_errno},
+ {"pwd", PyInit_pwd},
+ {"_sre", PyInit__sre},
+ {"_codecs", PyInit__codecs},
+ {"_weakref", PyInit__weakref},
+ {"_functools", PyInit__functools},
+ {"_operator", PyInit__operator},
+ {"_collections", PyInit__collections},
+ {"_abc", PyInit__abc},
+ {"itertools", PyInit_itertools},
+ {"atexit", PyInit_atexit},
+ {"_signal", PyInit__signal},
+ {"_stat", PyInit__stat},
+ {"time", PyInit_time},
+ {"_thread", PyInit__thread},
+ {"_locale", PyInit__locale},
+ {"_io", PyInit__io},
+ {"faulthandler", PyInit_faulthandler},
+ {"_tracemalloc", PyInit__tracemalloc},
+ {"_symtable", PyInit__symtable},
+ {"xxsubtype", PyInit_xxsubtype},
+
/* -- ADDMODULE MARKER 2 -- */
/* This module lives in marshal.c */
diff --git a/android/darwin_x86_64/pyconfig/pyconfig.h b/android/darwin_x86_64/pyconfig/pyconfig.h
index 8f8877b..2c9f57e 100644
--- a/android/darwin_x86_64/pyconfig/pyconfig.h
+++ b/android/darwin_x86_64/pyconfig/pyconfig.h
@@ -1270,7 +1270,7 @@
/* Define if you have a useable wchar_t type defined in wchar.h; useable means
wchar_t must be an unsigned type with at least 16 bits. (see
Include/unicodeobject.h). */
-/* #undef HAVE_USABLE_WCHAR_T */
+#define HAVE_USABLE_WCHAR_T 1
/* Define to 1 if you have the <util.h> header file. */
#define HAVE_UTIL_H 1
@@ -1334,7 +1334,7 @@
#define HAVE_WRITEV 1
/* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */
-#define HAVE_X509_VERIFY_PARAM_SET1_HOST 1
+/* #undef HAVE_X509_VERIFY_PARAM_SET1_HOST */
/* Define if the zlib library has inflateCopy */
#define HAVE_ZLIB_COPY 1
@@ -1378,7 +1378,7 @@
/* #undef PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT */
/* Defined if PTHREAD_SCOPE_SYSTEM supported. */
-#define PTHREAD_SYSTEM_SCHED_SUPPORTED 1
+/* #undef PTHREAD_SYSTEM_SCHED_SUPPORTED */
/* Define as the preferred size in bits of long digits */
/* #undef PYLONG_BITS_IN_DIGIT */
@@ -1419,7 +1419,7 @@
/* #undef SHM_NEEDS_LIBRT */
/* Define if i>>j for signed int i does not extend the sign bit when i < 0 */
-/* #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS */
+#define SIGNED_RIGHT_SHIFT_ZERO_FILLS 1
/* The size of `double', as computed by sizeof. */
#define SIZEOF_DOUBLE 8
@@ -1519,6 +1519,10 @@
/* Define if WINDOW in curses.h offers a field _flags. */
#define WINDOW_HAS_FLAGS 1
+/* Define if you want build the _decimal module using a coroutine-local rather
+ than a thread-local context */
+#define WITH_DECIMAL_CONTEXTVAR 1
+
/* Define if you want documentation strings in extension modules */
#define WITH_DOC_STRINGS 1
diff --git a/android/regen.sh b/android/regen.sh
index 524d7f3..e4fe45b 100755
--- a/android/regen.sh
+++ b/android/regen.sh
@@ -42,6 +42,9 @@
# utimensat and futimens are not safe on <10.13, which we still target
sed -ibak "s%#define HAVE_UTIMENSAT 1%/* #undef HAVE_UTIMENSAT */%" pyconfig.h
sed -ibak "s%#define HAVE_FUTIMENS 1%/* #undef HAVE_FUTIMENS */%" pyconfig.h
+ # preadv and pwritev are not safe on <11, which we still target
+ sed -ibak "s%#define HAVE_PREADV 1%/* #undef HAVE_PREADV */%" pyconfig.h
+ sed -ibak "s%#define HAVE_PWRITEV 1%/* #undef HAVE_PWRITEV */%" pyconfig.h
fi
cp pyconfig.h ../pyconfig/