From bbadc5e14136a4a2011080c08e064108d71e1429 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 22 Jan 2019 12:52:55 -0800 Subject: Fix sigjmp_buf/jmp_buf mismatches. Broke the bionic build: external/toybox/toys/net/netcat.c:188:37: error: incompatible pointer types assigning to 'sigjmp_buf *' (aka 'long (*)[33]') from 'jmp_buf *' (aka 'long (*)[32]') [-Werror,-Wincompatible-pointer-types] if (toys.optflags&FLAG_L) NOEXIT(child = XVFORK()); ^~~~~~~~~~~~~~~~~~~~~~~~ external/toybox/lib/lib.h:375:19: note: expanded from macro 'NOEXIT' #define NOEXIT(x) WOULD_EXIT(_noexit_res, x) ^~~~~~~~~~~~~~~~~~~~~~~~~~ external/toybox/lib/lib.h:367:16: note: expanded from macro 'WOULD_EXIT' toys.rebound = &_noexit; \ ^ ~~~~~~~~ 1 error generated. --- toys.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toys.h') diff --git a/toys.h b/toys.h index df37b55e..9e49900b 100644 --- a/toys.h +++ b/toys.h @@ -108,7 +108,7 @@ extern struct toy_context { char wasroot; // dropped setuid // This is at the end so toy_init() doesn't zero it. - sigjmp_buf *rebound; // longjmp here instead of exit when do_rebound set + sigjmp_buf *rebound; // siglongjmp here instead of exit when do_rebound struct arg_list *xexit; // atexit() functions for xexit(), set by sigatexit() void *stacktop; // nested toy_exec() call count, or 0 if vforked } toys; -- cgit v1.2.3