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

[zware]

https://github.com/python/cpython/commit/fd4b55ff17b1525d36f1e81762fca6f1a7bc59c5
commit: fd4b55ff17b1525d36f1e81762fca6f1a7bc59c5
branch: main
author: Zachary Ware <zach at python.org>
committer: zware <zachary.ware at gmail.com>
date: 2022-12-28T12:06:58-06:00
summary:

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.

files:
M Modules/_ctypes/callbacks.c
M configure
M configure.ac

diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index 459632b90907..f6880889dc0f 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)))
diff --git a/configure b/configure
index 3f8daf9dad5f..72299939892d 100755
--- a/configure
+++ b/configure
@@ -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 734a4db83899..d6499be4c007 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"])]