diff options
| author | Elliott Hughes <enh@google.com> | 2019-01-22 12:52:55 -0800 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2019-01-22 18:31:24 -0600 |
| commit | bbadc5e14136a4a2011080c08e064108d71e1429 (patch) | |
| tree | d2b279d4c1ab3cc797764370c2ca3f058bd9b675 /toys.h | |
| parent | 208163ac89cfc14db46cd089110517761b69dc76 (diff) | |
| download | toybox-bbadc5e14136a4a2011080c08e064108d71e1429.tar.gz | |
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.
Diffstat (limited to 'toys.h')
| -rw-r--r-- | toys.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |