diff --git a/ccan/README b/ccan/README index d132d3213..91800fde4 100644 --- a/ccan/README +++ b/ccan/README @@ -1,3 +1,3 @@ CCAN imported from http://ccodearchive.net. -CCAN version: init-2401-ge2d15a2b +CCAN version: init-2402-gec1f7161 diff --git a/ccan/ccan/tal/path/path.c b/ccan/ccan/tal/path/path.c index c7a134e3c..b50120667 100644 --- a/ccan/ccan/tal/path/path.c +++ b/ccan/ccan/tal/path/path.c @@ -11,9 +11,6 @@ #include #include -#define PATH_SEP_STR "/" -#define PATH_SEP (PATH_SEP_STR[0]) - char *path_cwd(const tal_t *ctx) { size_t len = 64; diff --git a/ccan/ccan/tal/path/path.h b/ccan/ccan/tal/path/path.h index 5678fd1a9..2f7f608b2 100644 --- a/ccan/ccan/tal/path/path.h +++ b/ccan/ccan/tal/path/path.h @@ -165,4 +165,8 @@ char **path_split(const tal_t *ctx, const char *path TAKES); */ size_t path_ext_off(const char *path); +/* Separator constants */ +#define PATH_SEP_STR "/" +#define PATH_SEP (PATH_SEP_STR[0]) + #endif /* CCAN_PATH_H */ diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c index 2b3ee7a9e..b716dbbfa 100644 --- a/lightningd/lightningd.c +++ b/lightningd/lightningd.c @@ -128,10 +128,6 @@ static const char *find_my_path(const tal_t *ctx, const char *argv0) { char *me, *tmpctx = tal_tmpctx(ctx); - /* FIXME: Expose in CCAN! */ -#define PATH_SEP_STR "/" -#define PATH_SEP (PATH_SEP_STR[0]) - if (strchr(argv0, PATH_SEP)) { const char *path; /* Absolute paths are easy. */