diff --git a/eval.c b/eval.c index 9c0c559f..472c8179 100644 --- a/eval.c +++ b/eval.c @@ -1221,10 +1221,10 @@ sexp sexp_get_port_fileno (sexp ctx, sexp self, sexp_sint_t n, sexp port) { #endif #if SEXP_USE_STATIC_LIBS -#ifndef PLAN9 -#include "clibs.c" -#else +#if SEXP_USE_STATIC_LIBS_NO_INCLUDE struct sexp_library_entry_t sexp_static_libraries[]; +#else +#include "clibs.c" #endif static struct sexp_library_entry_t *sexp_find_static_library(const char *file) { diff --git a/include/chibi/features.h b/include/chibi/features.h index 02f66314..9103df2a 100644 --- a/include/chibi/features.h +++ b/include/chibi/features.h @@ -336,6 +336,11 @@ #define SEXP_USE_STATIC_LIBS 0 #endif +/* don't include clibs.c - include separately or link */ +#ifndef SEXP_USE_STATIC_LIBS_NO_INCLUDE +#define SEXP_USE_STATIC_LIBS_NO_INCLUDE defined(PLAN9) +#endif + #ifndef SEXP_USE_FULL_SOURCE_INFO #define SEXP_USE_FULL_SOURCE_INFO ! SEXP_USE_NO_FEATURES #endif