gh-100540: Remove unnecessary '-DMACOSX' for ctypes on macOS (GH-100542)

The define was only used to protect a `#pragma clang diagnostic`
setting, which is already better guarded by `__clang__` anwyay.
This commit is contained in:
Zachary Ware 2022-12-28 12:06:58 -06:00 committed by GitHub
parent 5e1adb4f88
commit fd4b55ff17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -426,7 +426,7 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
PyErr_Format(PyExc_NotImplementedError, "ffi_prep_closure_loc() is missing");
goto error;
#else
#if defined(__clang__) || defined(MACOSX)
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
@ -436,7 +436,7 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
#endif
result = ffi_prep_closure(p->pcl_write, &p->cif, closure_fcn, p);
#if defined(__clang__) || defined(MACOSX)
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))

2
configure generated vendored
View File

@ -12846,7 +12846,7 @@ if test "x$have_libffi" = xyes; then :
case $ac_sys_system in #(
Darwin) :
as_fn_append LIBFFI_CFLAGS " -I\$(srcdir)/Modules/_ctypes/darwin -DMACOSX"
as_fn_append LIBFFI_CFLAGS " -I\$(srcdir)/Modules/_ctypes/darwin"
ctypes_malloc_closure=yes
;; #(
sunos5) :

View File

@ -3769,7 +3769,7 @@ AS_VAR_IF([have_libffi], [yes], [
AS_CASE([$ac_sys_system],
[Darwin], [
dnl when do we need USING_APPLE_OS_LIBFFI?
AS_VAR_APPEND([LIBFFI_CFLAGS], [" -I\$(srcdir)/Modules/_ctypes/darwin -DMACOSX"])
AS_VAR_APPEND([LIBFFI_CFLAGS], [" -I\$(srcdir)/Modules/_ctypes/darwin"])
ctypes_malloc_closure=yes
],
[sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])]