traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-33182: Fix pointer types in _testembed (GH-6310)

This commit is contained in:
Nick Coghlan 2018-03-30 15:36:42 +10:00 committed by GitHub
parent 521995205a
commit 69f5c73311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2018-03-30-14-55-48.bpo-33182.CePczb.rst Normal file
View File

@ -0,0 +1 @@
The embedding tests can once again be built with clang 6.0

12
Programs/_testembed.c
View File

@ -166,16 +166,18 @@ static int test_pre_initialization_api(void)
/* bpo-33042: Ensure embedding apps can predefine sys module options */ /* bpo-33042: Ensure embedding apps can predefine sys module options */
static int test_pre_initialization_sys_options(void) static int test_pre_initialization_sys_options(void)
{ {
/* We allocate a couple of the option dynamically, and then delete /* We allocate a couple of the options dynamically, and then delete
* them before calling Py_Initialize. This ensures the interpreter isn't * them before calling Py_Initialize. This ensures the interpreter isn't
* relying on the caller to keep the passed in strings alive. * relying on the caller to keep the passed in strings alive.
*/ */
wchar_t *static_warnoption = L"once"; const wchar_t *static_warnoption = L"once";
wchar_t *static_xoption = L"also_not_an_option=2"; const wchar_t *static_xoption = L"also_not_an_option=2";
size_t warnoption_len = wcslen(static_warnoption); size_t warnoption_len = wcslen(static_warnoption);
size_t xoption_len = wcslen(static_xoption); size_t xoption_len = wcslen(static_xoption);
wchar_t *dynamic_once_warnoption = calloc(warnoption_len+1, sizeof(wchar_t)); wchar_t *dynamic_once_warnoption = \
wchar_t *dynamic_xoption = calloc(xoption_len+1, sizeof(wchar_t)); (wchar_t *) calloc(warnoption_len+1, sizeof(wchar_t));
wchar_t *dynamic_xoption = \
(wchar_t *) calloc(xoption_len+1, sizeof(wchar_t));
wcsncpy(dynamic_once_warnoption, static_warnoption, warnoption_len+1); wcsncpy(dynamic_once_warnoption, static_warnoption, warnoption_len+1);
wcsncpy(dynamic_xoption, static_xoption, xoption_len+1); wcsncpy(dynamic_xoption, static_xoption, xoption_len+1);