Skip to content

Commit 0d4f779

Browse files
authored
Update TCL channels and fix ARM_CRYPTO attributes (#1166)
1 parent 5625e80 commit 0d4f779

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/rt/shell.c

+7-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949

5050
#define TIME_BUFSZ 32
5151

52+
#if TCL_MAJOR_VERSION < 9
53+
typedef int Tcl_Size;
54+
#endif
55+
5256
typedef struct {
5357
const char *name;
5458
Tcl_ObjCmdProc *fn;
@@ -1065,7 +1069,8 @@ static char *shell_list_generator(const char *script, const char *text,
10651069
int state, int prefix)
10661070
{
10671071
static Tcl_Obj *list = NULL;
1068-
static int index, len, max;
1072+
static int index, len;
1073+
static Tcl_Size max;
10691074

10701075
if (!state) {
10711076
if (Tcl_Eval(rl_shell->interp, script) != TCL_OK)
@@ -1470,7 +1475,7 @@ static int shell_redirect_output(ClientData cd, const char *buf, int nchars,
14701475

14711476
static const Tcl_ChannelType redirect_funcs = {
14721477
.typeName = "redirect",
1473-
.version = TCL_CHANNEL_VERSION_4,
1478+
.version = TCL_CHANNEL_VERSION_5,
14741479
.closeProc = shell_redirect_close,
14751480
.watchProc = shell_redirect_watch,
14761481
.outputProc = shell_redirect_output,

thirdparty/sha1.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ static void sha1_process_x86(uint32_t state[5], const uint8_t data[], size_t len
305305

306306
#ifdef HAVE_ARM_CRYPTO
307307
#ifdef __clang__
308-
__attribute__((target("crypto")))
308+
__attribute__((target("crypto,sha2")))
309309
#else
310310
__attribute__((target("+crypto")))
311311
#endif

0 commit comments

Comments
 (0)