From f28abfe8dde45e2bbe5ca73c8a0494f0e27a1307 Mon Sep 17 00:00:00 2001
From: Chase <nicetrynsa@protonmail.ch>
Date: Sun, 15 Dec 2019 10:28:22 -0600
Subject: [PATCH] dtksh: remove needless OS defines

---
 cde/programs/dtksh/dtkcvt.c | 9 ++-------
 cde/programs/dtksh/xmcmds.c | 8 --------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/cde/programs/dtksh/dtkcvt.c b/cde/programs/dtksh/dtkcvt.c
index a03ccf6f..04a69594 100644
--- a/cde/programs/dtksh/dtkcvt.c
+++ b/cde/programs/dtksh/dtkcvt.c
@@ -67,11 +67,6 @@
 #include "xmwidgets.h"
 #include "msgs.h"
 
-#if defined(SYSV) || defined(SVR4_0) || defined(SVR4) || defined(CSRG_BASED) \
- || defined(__linux__) || defined(sun)
-#define lsprintf sprintf
-#endif
-
 extern Hashtab_t * Wclasses;
 
 
@@ -486,9 +481,9 @@ DtkshCvtCallbackToString(
             break;
          }
          if (count > 0)
-            p += lsprintf(p, "|%s", (String)cdata->ksh_cmd);
+            p += sprintf(p, "|%s", (String)cdata->ksh_cmd);
          else
-            p += lsprintf(p, "%s", (String)cdata->ksh_cmd);
+            p += sprintf(p, "%s", (String)cdata->ksh_cmd);
          count++;
       }
    }
diff --git a/cde/programs/dtksh/xmcmds.c b/cde/programs/dtksh/xmcmds.c
index 07429896..e3f1e8bd 100644
--- a/cde/programs/dtksh/xmcmds.c
+++ b/cde/programs/dtksh/xmcmds.c
@@ -3737,10 +3737,7 @@ do_catopen(
    char * ptr;
    nl_catd nlmsg_fd = (nl_catd)-1;
    char * errmsg;
-#if defined(SVR4) || defined (_AIX) || defined(CSRG_BASED) || \
-    defined(__linux__) || defined(sun)
    char * nextMatch;
-#endif
 
    if (argc != 3)
    {
@@ -3762,8 +3759,6 @@ do_catopen(
        */
 
       altCatName = XtMalloc(strlen(catName) + 10);
-#if defined(SVR4) || defined (_AIX) || defined(CSRG_BASED) || \
-    defined(__linux__) || defined(sun)
       /* These platforms don't have strrstr() */
       ptr = NULL;
       nextMatch = catName;
@@ -3772,9 +3767,6 @@ do_catopen(
          ptr = nextMatch;
          nextMatch++;
       }
-#else
-      ptr = (char *)strrstr(catName, ".cat");
-#endif
       if (ptr && (strlen(ptr) == 4))
       {
          /* Strip off the ".cat", and try again */
-- 
2.25.1