From 677e6e431aa1b1ccd1cd61ba69cbc1a1c1201970 Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Fri, 3 Mar 2023 13:23:01 +0300 Subject: configure: fixed checks for tsearch() and related New check works correctly with new compilers. Added known problematic implementations. Added more checks for correct behaviour. Removed some m4 macros. --- src/microhttpd/Makefile.am | 2 +- src/microhttpd/daemon.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/microhttpd') diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am index 8e6e623a..36ad802f 100644 --- a/src/microhttpd/Makefile.am +++ b/src/microhttpd/Makefile.am @@ -153,7 +153,7 @@ if USE_COVERAGE AM_CFLAGS += --coverage endif -if !MHD_HAVE_TSEARCH +if !MHD_USE_SYS_TSEARCH libmicrohttpd_la_SOURCES += \ tsearch.c tsearch.h endif diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index c9c0d51c..5e9be378 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c @@ -47,11 +47,11 @@ #include "mhd_align.h" #include "mhd_str.h" -#ifdef HAVE_SEARCH_H +#ifdef MHD_USE_SYS_TSEARCH #include -#else +#else /* ! MHD_USE_SYS_TSEARCH */ #include "tsearch.h" -#endif +#endif /* ! MHD_USE_SYS_TSEARCH */ #ifdef HTTPS_SUPPORT #include "connection_https.h" -- cgit v1.2.3