From ae35984780c7587fff7029ef5655f9ce6c4acc66 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 11 Feb 2024 13:14:29 -0800
Subject: [PATCH] unifdef hpux
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
src/Initialize.c | 6 ------
src/Intrinsic.c | 19 +------------------
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/src/Initialize.c b/src/Initialize.c
index 03bb59c..5d2c92a 100644
--- a/src/Initialize.c
+++ b/src/Initialize.c
@@ -101,12 +101,6 @@ in this Software without prior written authorization from The Open Group.
#define XtInitialize _XtInitialize
#endif /* (SUNSHLIB || AIXSHLIB) && SHAREDCODE */
-/*
- * hpux
- * Hand-patched versions of HP-UX prior to version 7.0 can usefully add
- * -DUSE_UNAME in the appropriate config file to get long hostnames.
- */
-
#ifdef USG
#define USE_UNAME
#endif
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index 6171961..e98be86 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -1170,23 +1170,7 @@ static String
ExtractLocaleName(String lang)
{
-#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(__osf__) || defined(AIXV3) || defined(WIN32) || defined (linux)
-#ifdef hpux
-/*
- * We need to discriminated between HPUX 9 and HPUX 10. The equivalent
- * code in Xlib in SetLocale.c does include locale.h via X11/Xlocale.h.
- */
-#include <locale.h>
-#ifndef _LastCategory
- /* HPUX 9 and earlier */
-#define SKIPCOUNT 2
-#define STARTCHAR ':'
-#define ENDCHAR ';'
-#else
- /* HPUX 10 */
-#define ENDCHAR ' '
-#endif
-#else
+#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(__osf__) || defined(AIXV3) || defined(WIN32) || defined (linux)
#ifdef WIN32
#define SKIPCOUNT 1
#define STARTCHAR '='
@@ -1207,7 +1191,6 @@ ExtractLocaleName(String lang)
#endif
#endif
#endif
-#endif
#endif
String start;
--
GitLab