Skip to content

Commit fd4b55f

Browse files
authored
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.
1 parent 5e1adb4 commit fd4b55f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Modules/_ctypes/callbacks.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
426426
PyErr_Format(PyExc_NotImplementedError, "ffi_prep_closure_loc() is missing");
427427
goto error;
428428
#else
429-
#if defined(__clang__) || defined(MACOSX)
429+
#if defined(__clang__)
430430
#pragma clang diagnostic push
431431
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
432432
#endif
@@ -436,7 +436,7 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
436436
#endif
437437
result = ffi_prep_closure(p->pcl_write, &p->cif, closure_fcn, p);
438438

439-
#if defined(__clang__) || defined(MACOSX)
439+
#if defined(__clang__)
440440
#pragma clang diagnostic pop
441441
#endif
442442
#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))

configure

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -3769,7 +3769,7 @@ AS_VAR_IF([have_libffi], [yes], [
37693769
AS_CASE([$ac_sys_system],
37703770
[Darwin], [
37713771
dnl when do we need USING_APPLE_OS_LIBFFI?
3772-
AS_VAR_APPEND([LIBFFI_CFLAGS], [" -I\$(srcdir)/Modules/_ctypes/darwin -DMACOSX"])
3772+
AS_VAR_APPEND([LIBFFI_CFLAGS], [" -I\$(srcdir)/Modules/_ctypes/darwin"])
37733773
ctypes_malloc_closure=yes
37743774
],
37753775
[sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])]

0 commit comments

Comments
 (0)