Skip to content

Commit 101aeea

Browse files
committed
ccan: update to latest version
Gives us more room for user bits in opt. Signed-off-by: Rusty Russell <[email protected]>
1 parent e261301 commit 101aeea

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ccan/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CCAN imported from http://ccodearchive.net.
22

3-
CCAN version: init-2587-gf927e4be
3+
CCAN version: init-2589-g161fe383

ccan/ccan/opt/opt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ struct opt_table *opt_find_short(char arg);
530530
* You can set bits in type e.g. (1<<OPT_USER_START) to (1<<OPT_USER_END)
531531
* when calling _opt_register. */
532532
#define OPT_USER_START 8
533-
#define OPT_USER_END 15
533+
#define OPT_USER_END 30
534534

535535
/* Below here are private declarations. */
536536
/* You can use this directly to build tables, but the macros will ensure
@@ -540,7 +540,7 @@ enum opt_type {
540540
OPT_HASARG = 2, /* -f arg|--foo=arg|--foo arg */
541541
OPT_SUBTABLE = 4, /* Actually, longopt points to a subtable... */
542542
OPT_EARLY = 8, /* Parse this from opt_early_parse() only. */
543-
OPT_END = 16, /* End of the table. */
543+
OPT_END = 31, /* End of the table. */
544544

545545
/* Make sure no compiler will assume we never have large
546546
* values in the enum! */

ccan/ccan/tcon/tcon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
* It evaluates to @x so you can chain it.
148148
*/
149149
#define tcon_check_ptr(x, canary, expr) \
150-
(sizeof((expr) ? (expr) : &(x)->_tcon[0].canary) ? (x) : (x))
150+
(sizeof(0 ? (expr) : &(x)->_tcon[0].canary) ? (x) : (x))
151151

152152
/**
153153
* tcon_type - the type within a container (or void *)

0 commit comments

Comments
 (0)