From 53414e210d22b4bc2cabf54c9230eaaa8519a787 Mon Sep 17 00:00:00 2001
From: "H.Merijn Brand - Tux" <linux@tux.freedom.nl>
Date: Fri, 26 May 2023 13:25:37 +0200
Subject: [PATCH] fix NAN/INF for AIX (Tux: AIX-5.3, tested by XSven on
 AIX-7.3) GH #165

---
 Changes         |  3 +++
 XS.xs           | 22 +++++++++++++++++-----
 t/117_numbers.t |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Changes b/Changes
index 0858f76..24ccb91 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,9 @@ Revision history for Perl extension Cpanel::JSON::XS
 
 TODO: http://stevehanov.ca/blog/index.php?id=104 compression
 
+4.37 ...
+	- fix NAN/INF for AIX (Tux: AIX-5.3, tested by XSven on AIX-7.3) GH #165
+
 4.36 2023-03-02 (rurban)
         - remove the SAVESTACK_POS noop. Merged from JSON-XS-3.02,
           removed there with 4.0. requested to remove with
diff --git a/XS.xs b/XS.xs
index 4b0457e..acbb00f 100644
--- a/XS.xs
+++ b/XS.xs
@@ -88,15 +88,17 @@
 #define HAVE_NEG_NAN
 #define STR_NEG_INF "---"
 #define STR_NEG_NAN "?"
-#elif defined(_AIX)
+#elif defined(_AIX) || defined(_AIX50)
 /* xlC compiler: __TOS_AIX__ FIXME: This does not work yet. GH #165 */
-#define STR_INF "INF.0"
-#define STR_INF2 "-INF.0"
+#define STR_INF "INF"
+#define STR_INF2 "INF.0"
+#define HAVE_NEG_NAN
+#define STR_NEG_INF "-INF"
 #define HAVE_NEG_NAN
 #define HAVE_QNAN
 #define STR_NAN "NaN"
-//#define STR_QNAN "NaNQ"
-#define STR_QNAN "NANQ"
+#define STR_QNAN "NaNQ"
+//#define STR_QNAN "NANQ"
 #else
 #define STR_INF "inf"
 #define STR_NAN "nan"
@@ -2219,6 +2221,9 @@ encode_sv (pTHX_ enc_t *enc, SV *sv, SV *typesv)
             }
 #endif
 
+/* #if defined(_AIX) || defined(_AIX50)
+ * (void)fprintf (stderr, "#|# >%s<\n", enc->cur);
+ * #endif */
 #ifdef STR_INF4
           if (UNLIKELY(strEQc(enc->cur, STR_INF)
                        || strEQc(enc->cur, STR_INF2)
@@ -2236,6 +2241,13 @@ encode_sv (pTHX_ enc_t *enc, SV *sv, SV *typesv)
             inf_or_nan = 2;
           else if (UNLIKELY(strEQc(enc->cur, STR_NEG_NAN)))
             inf_or_nan = 3;
+#endif
+#if defined(_AIX) || defined(_AIX50)
+          else if (UNLIKELY(strEQc(enc->cur, STR_INF)
+                         || strEQc(enc->cur, STR_INF2)))
+            inf_or_nan = 1;
+          else if (UNLIKELY(strEQc(enc->cur, STR_NEG_INF)))
+            inf_or_nan = 2;
 #endif
           else if
 #ifdef HAVE_QNAN
diff --git a/t/117_numbers.t b/t/117_numbers.t
index cbc8679..0cbb47f 100644
--- a/t/117_numbers.t
+++ b/t/117_numbers.t
@@ -21,7 +21,7 @@ my (@inf, @neg_inf, @nan, @neg_nan);
 my ($inf, $nan) =
   ($^O eq 'MSWin32') ? ('1.#INF','1.#QNAN') :
   ($^O eq 'solaris') ? ('Infinity','NaN') :
-  ($^O eq 'aix')     ? ('inf','NANQ') :
+  ($^O eq 'aix')     ? ('INF','NaNQ') :
   ($^O eq 'hpux')    ? ('++','-?') :
                        ('inf','nan');
 my $neg_nan =