diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c27167..0efb933 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ project(c-capnproto LANGUAGES ${languages}) include(CTest) -set(CMAKE_C_STANDARD 11) -set(CMAKE_C_EXTENSIONS NO) +# set(CMAKE_C_STANDARD 11) +# set(CMAKE_C_EXTENSIONS NO) if(BUILD_TESTING) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_EXTENSIONS NO) @@ -170,6 +170,7 @@ if(C_CAPNPROTO_ENABLE_INSTALL) install(FILES lib/capnp_c.h TYPE INCLUDE) endif() +add_subdirectory(examples/book) if(BUILD_TESTING AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) add_subdirectory(tests) endif() diff --git a/compiler/capnpc-c.c b/compiler/capnpc-c.c index 80de50a..af15071 100644 --- a/compiler/capnpc-c.c +++ b/compiler/capnpc-c.c @@ -2017,11 +2017,11 @@ static void define_struct(capnp_ctx_t *ctx, struct node *n, const char *extattr, &(ctx->SRC), "\nvoid encode_%s(struct capn_segment *cs,struct %s *d, %s *s) {\n", n->name.str, n->name.str, buf); - str_addf(&(ctx->SRC), "%s\n", s.encoder); + str_addf(&(ctx->SRC), "%s\n", s.encoder.str); str_addf(&(ctx->SRC), "}\n"); str_addf(&(ctx->SRC), "\nvoid decode_%s(%s *d, struct %s *s) {\n", n->name.str, buf, n->name.str); - str_addf(&(ctx->SRC), "%s\n", s.decoder); + str_addf(&(ctx->SRC), "%s\n", s.decoder.str); str_addf(&(ctx->SRC), "}\n"); } diff --git a/examples/book/test.c b/examples/book/test.c index d4c03c4..fd51655 100644 --- a/examples/book/test.c +++ b/examples/book/test.c @@ -6,7 +6,7 @@ static void usage(char *app) { fprintf(stderr, "usage: %s encode | %s decode\n", - app); + app, app); } int encode() {