[3.13] Revert "gh-136006: fix `Py_NAN` expansion on Solaris systems (GH-136575) ...

This reverts commit df349036b3f912e539643d91b84cbce32e4a1051 as discussed in https://github.com/python/cpython/pull/138733#issuecomment-3317818806

diff --git a/Include/pymath.h b/Include/pymath.h
index cfae2477d7fce3aa13dbbe6f2e552b086e885fde..4c1e3d9984894b0cb27dfb387e3e3b8781e14091 100644 (file)
--- a/Include/pymath.h
+++ b/Include/pymath.h
@@ -54,24 +54,9 @@
 
 /* Py_NAN: Value that evaluates to a quiet Not-a-Number (NaN).  The sign is
  * undefined and normally not relevant, but e.g. fixed for float("nan").
- *
- * Note: On Solaris, NAN is a function address, hence arithmetic is impossible.
- * For that reason, we instead use the built-in call if available or fallback
- * to a generic NaN computed from strtod() as a last resort.
- *
- * See https://github.com/python/cpython/issues/136006 for details.
  */
 #if !defined(Py_NAN)
-#  if defined(__sun)
-#    if _Py__has_builtin(__builtin_nanf)
-#       define Py_NAN   ((double)__builtin_nanf(""))
-#    else
-#       include <stdlib.h>
-#       define Py_NAN   (strtod("NAN", NULL))
-#    endif
-#  else
-#    define Py_NAN      ((double)NAN)
-#  endif
+#    define Py_NAN ((double)NAN)
 #endif
 
 #endif /* Py_PYMATH_H */

diff --git a/Misc/NEWS.d/next/C API/2025-07-08-22-07-54.gh-issue-136006.XRU5w4.rst b/Misc/NEWS.d/next/C API/2025-07-08-22-07-54.gh-issue-136006.XRU5w4.rst
deleted file mode 100644 (file)
index 2165e53..0000000
--- a/Misc/NEWS.d/next/C API/2025-07-08-22-07-54.gh-issue-136006.XRU5w4.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-On Solaris, the :c:macro:`!Py_NAN` macro now expands to a :c:type:`!double`
-instead of a function address. Patch by Bénédikt Tran.