From 0df284b450933e0239d1a85a7ff2d0c9d44d22af Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 11 Feb 2024 14:50:29 -0800
Subject: [PATCH] unifdef ultrix

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 src/SetLocale.c | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/SetLocale.c b/src/SetLocale.c
index 20c56d62..f590761d 100644
--- a/src/SetLocale.c
+++ b/src/SetLocale.c
@@ -99,7 +99,7 @@ _XlcMapOSLocaleName(
     char *osname,
     char *siname)
 {
-#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(ultrix) || defined(WIN32) || defined(__UNIXOS2__) || defined(linux)
+#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(WIN32) || defined(__UNIXOS2__) || defined(linux)
 # ifdef hpux
 #  ifndef _LastCategory
    /* HPUX 9 and earlier */
@@ -111,25 +111,19 @@ _XlcMapOSLocaleName(
 #   define ENDCHAR ' '
 #  endif
 # else
-#  ifdef ultrix
-#   define SKIPCOUNT 2
-#   define STARTCHAR '\001'
-#   define ENDCHAR '\001'
+#  if defined(WIN32) || defined(__UNIXOS2__)
+#   define SKIPCOUNT 1
+#   define STARTCHAR '='
+#   define ENDCHAR ';'
+#   define WHITEFILL
 #  else
-#   if defined(WIN32) || defined(__UNIXOS2__)
-#    define SKIPCOUNT 1
-#    define STARTCHAR '='
+#   if defined(linux)
+#    define STARTSTR "LC_CTYPE="
 #    define ENDCHAR ';'
-#    define WHITEFILL
 #   else
-#    if defined(linux)
-#     define STARTSTR "LC_CTYPE="
-#     define ENDCHAR ';'
-#    else
-#     if !defined(sun) || defined(SVR4)
-#      define STARTCHAR '/'
-#      define ENDCHAR '/'
-#     endif
+#    if !defined(sun) || defined(SVR4)
+#     define STARTCHAR '/'
+#     define ENDCHAR '/'
 #    endif
 #   endif
 #  endif