Since Lev fixed the errors in upstream for musl and upstreamed them, lets pull
that in so any potential merge to master also can safely build on musl (thus
the old changes from Lev we would throw away for old ksh would be replaced with
the new changes)l. I also threw in compiler warning fixes for xmcmds.c.
Thank you for your time,
-Chase
From 097193515abb880129b8fcf8c198ceb523b7cd42 Mon Sep 17 00:00:00 2001
From: Chase <nicetry...@protonmail.ch>
Date: Fri, 22 Jan 2021 17:36:32 -0600
Subject: [PATCH] dtksh: update ksh to commit 47468f (fix musl compiler errors)
---
cde/programs/dtksh/dtksh.h | 2 --
cde/programs/dtksh/ksh93 | 2 +-
cde/programs/dtksh/xmcmds.c | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/cde/programs/dtksh/dtksh.h b/cde/programs/dtksh/dtksh.h
index 1313c414f..5bc6e1069 100644
--- a/cde/programs/dtksh/dtksh.h
+++ b/cde/programs/dtksh/dtksh.h
@@ -33,8 +33,6 @@
#ifndef _Dtksh_dtksh_h
#define _Dtksh_dtksh_h
-#include "nval.h"
-
#define SUCCESS 0
#define FAIL (-1)
diff --git a/cde/programs/dtksh/ksh93 b/cde/programs/dtksh/ksh93
index 6025c8125..47468f56c 160000
--- a/cde/programs/dtksh/ksh93
+++ b/cde/programs/dtksh/ksh93
@@ -1 +1 @@
-Subproject commit 6025c8125e596ccf5e25c651a8800c072310f3a4
+Subproject commit 47468f56c2d0506045120fb4d0709f3a734693f5
diff --git a/cde/programs/dtksh/xmcmds.c b/cde/programs/dtksh/xmcmds.c
index 7afbfae5d..5f6c3ded9 100644
--- a/cde/programs/dtksh/xmcmds.c
+++ b/cde/programs/dtksh/xmcmds.c
@@ -174,7 +174,7 @@ static int Text_VarAndWidget(
int argc,
char *argv[]) ;
static int Text_WidgetAndBoolean(
- void (*func)(Widget w, int b),
+ void (*func)(Widget w, char b),
int argc,
char *argv[]) ;
static int Text_WidgetAndOneParam(
@@ -4062,7 +4062,7 @@ do_XmTextGetString(
static int
Text_WidgetAndBoolean(
- void (*func)(Widget w, int b),
+ void (*func)(Widget w, char b),
int argc,
char *argv[] )
{
--
2.17.1
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
