ccan: update to latest version

Gives us more room for user bits in opt.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2024-09-06 15:42:09 +09:30
parent e261301301
commit 101aeea52c
3 changed files with 4 additions and 4 deletions

View File

@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net. CCAN imported from http://ccodearchive.net.
CCAN version: init-2587-gf927e4be CCAN version: init-2589-g161fe383

View File

@ -530,7 +530,7 @@ struct opt_table *opt_find_short(char arg);
* You can set bits in type e.g. (1<<OPT_USER_START) to (1<<OPT_USER_END) * You can set bits in type e.g. (1<<OPT_USER_START) to (1<<OPT_USER_END)
* when calling _opt_register. */ * when calling _opt_register. */
#define OPT_USER_START 8 #define OPT_USER_START 8
#define OPT_USER_END 15 #define OPT_USER_END 30
/* Below here are private declarations. */ /* Below here are private declarations. */
/* You can use this directly to build tables, but the macros will ensure /* You can use this directly to build tables, but the macros will ensure
@ -540,7 +540,7 @@ enum opt_type {
OPT_HASARG = 2, /* -f arg|--foo=arg|--foo arg */ OPT_HASARG = 2, /* -f arg|--foo=arg|--foo arg */
OPT_SUBTABLE = 4, /* Actually, longopt points to a subtable... */ OPT_SUBTABLE = 4, /* Actually, longopt points to a subtable... */
OPT_EARLY = 8, /* Parse this from opt_early_parse() only. */ OPT_EARLY = 8, /* Parse this from opt_early_parse() only. */
OPT_END = 16, /* End of the table. */ OPT_END = 31, /* End of the table. */
/* Make sure no compiler will assume we never have large /* Make sure no compiler will assume we never have large
* values in the enum! */ * values in the enum! */

View File

@ -147,7 +147,7 @@
* It evaluates to @x so you can chain it. * It evaluates to @x so you can chain it.
*/ */
#define tcon_check_ptr(x, canary, expr) \ #define tcon_check_ptr(x, canary, expr) \
(sizeof((expr) ? (expr) : &(x)->_tcon[0].canary) ? (x) : (x)) (sizeof(0 ? (expr) : &(x)->_tcon[0].canary) ? (x) : (x))
/** /**
* tcon_type - the type within a container (or void *) * tcon_type - the type within a container (or void *)