From 584f74dbd9d6a5a3cf891ae4f6a82ccc229587c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A8re=20J=C3=A9r=C3=B4me?= Date: Thu, 19 Nov 2015 09:37:37 +0100 Subject: [PATCH 1/3] Handle missing strcasestr() in MinGW --- include/chibi/features.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/chibi/features.h b/include/chibi/features.h index eabd97db..d867019f 100644 --- a/include/chibi/features.h +++ b/include/chibi/features.h @@ -739,6 +739,10 @@ #define isinf(x) (isInf(x,1) || isInf(x,-1)) #define isnan(x) isNaN(x) #elif defined(_WIN32) +#ifdef __MINGW32__ +#include +#define strcasestr StrStrI +#else #define snprintf(buf, len, fmt, val) sprintf(buf, fmt, val) #define strcasecmp lstrcmpi #define strncasecmp(s1, s2, n) lstrcmpi(s1, s2) @@ -747,6 +751,7 @@ #define isnan(x) (x!=x) #define isinf(x) (x > DBL_MAX || x < -DBL_MAX) #endif +#endif #ifdef _WIN32 #define sexp_pos_infinity (DBL_MAX*DBL_MAX) From 2f19dc69b175ee8ca91a9190ad3c6b2d5cc51bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A8re=20J=C3=A9r=C3=B4me?= Date: Thu, 19 Nov 2015 09:55:23 +0100 Subject: [PATCH 2/3] Exclude socket.h on Windows (unless using Cygwin) --- include/chibi/sexp.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/chibi/sexp.h b/include/chibi/sexp.h index 55cdf8ce..d67b3ccd 100755 --- a/include/chibi/sexp.h +++ b/include/chibi/sexp.h @@ -65,7 +65,9 @@ typedef unsigned long size_t; #include #include #include +#if !(defined _WIN32) || defined(__CYGWIN__) #include +#endif #include #include #include From 8022c7c98de94f809b59f526ba012e3337cdb930 Mon Sep 17 00:00:00 2001 From: Chris Walsh Date: Thu, 17 Dec 2015 00:05:00 -0500 Subject: [PATCH 3/3] Fixed argument name typo active when SEXP_USE_STATIC_LIBS selected --- eval.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eval.c b/eval.c index 4009a4f2..18ed2631 100644 --- a/eval.c +++ b/eval.c @@ -1302,11 +1302,11 @@ static sexp sexp_load_dl (sexp ctx, sexp file, sexp env) { #endif #if SEXP_USE_DL || SEXP_USE_STATIC_LIBS -static sexp sexp_load_binary(sexp ctx, sexp source, sexp env) { +static sexp sexp_load_binary(sexp ctx, sexp file, sexp env) { #if SEXP_USE_STATIC_LIBS struct sexp_library_entry_t *entry; #endif - sexp res = sexp_load_dl(ctx, source, env); + sexp res = sexp_load_dl(ctx, file, env); #if SEXP_USE_STATIC_LIBS if (res == SEXP_UNDEF || sexp_exceptionp(res)) { entry = sexp_find_static_library(sexp_string_data(file));