debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtksh: remove needless OS defines

Browse Source
This commit is contained in:
Chase
2019-12-15 10:28:22 -06:00
committed by Jon Trulson
parent cc73d03e49
commit f28abfe8dd
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cde/programs/dtksh/dtkcvt.c
View File

@@ -67,11 +67,6 @@
#include "xmwidgets.h" #include "xmwidgets.h"
#include "msgs.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; extern Hashtab_t * Wclasses;
@@ -486,9 +481,9 @@ DtkshCvtCallbackToString(
break; break;
} }
if (count > 0) if (count > 0)
p += lsprintf(p, "|%s", (String)cdata->ksh_cmd); p += sprintf(p, "|%s", (String)cdata->ksh_cmd);
else else
p += lsprintf(p, "%s", (String)cdata->ksh_cmd); p += sprintf(p, "%s", (String)cdata->ksh_cmd);
count++; count++;
} }
} }

8
cde/programs/dtksh/xmcmds.c
View File

@@ -3737,10 +3737,7 @@ do_catopen(
char * ptr; char * ptr;
nl_catd nlmsg_fd = (nl_catd)-1; nl_catd nlmsg_fd = (nl_catd)-1;
char * errmsg; char * errmsg;
#if defined(SVR4) || defined (_AIX) || defined(CSRG_BASED) || \
defined(__linux__) || defined(sun)
char * nextMatch; char * nextMatch;
#endif
if (argc != 3) if (argc != 3)
{ {
@@ -3762,8 +3759,6 @@ do_catopen(
*/ */
altCatName = XtMalloc(strlen(catName) + 10); altCatName = XtMalloc(strlen(catName) + 10);
#if defined(SVR4) || defined (_AIX) || defined(CSRG_BASED) || \
defined(__linux__) || defined(sun)
/* These platforms don't have strrstr() */ /* These platforms don't have strrstr() */
ptr = NULL; ptr = NULL;
nextMatch = catName; nextMatch = catName;
@@ -3772,9 +3767,6 @@ do_catopen(
ptr = nextMatch; ptr = nextMatch;
nextMatch++; nextMatch++;
} }
#else
ptr = (char *)strrstr(catName, ".cat");
#endif
if (ptr && (strlen(ptr) == 4)) if (ptr && (strlen(ptr) == 4))
{ {
/* Strip off the ".cat", and try again */ /* Strip off the ".cat", and try again */