diff options
| author | Zachary Ware <zach@python.org> | 2022-12-28 18:06:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-28 18:06:58 (GMT) |
| commit | fd4b55ff17b1525d36f1e81762fca6f1a7bc59c5 (patch) | |
| tree | 1505b38f22dffab2da530553ddee79a371949625 | |
| parent | 5e1adb4f8861f2a5969952d24c8ad0ce8ec0a8ec (diff) | |
| download | cpython-fd4b55ff17b1525d36f1e81762fca6f1a7bc59c5.zip cpython-fd4b55ff17b1525d36f1e81762fca6f1a7bc59c5.tar.gz cpython-fd4b55ff17b1525d36f1e81762fca6f1a7bc59c5.tar.bz2 | |
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.
| -rw-r--r-- | Modules/_ctypes/callbacks.c | 4 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index 459632b..f688088 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -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))) @@ -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) : diff --git a/configure.ac b/configure.ac index 734a4db..d6499be 100644 --- a/configure.ac +++ b/configure.ac @@ -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"])] |