From 045edf7c5561b421080e2f15adb78c34e79b43b8 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Tue, 19 Dec 2023 22:56:58 +0100 Subject: [PATCH] [httpd] Replace syscall with gettid, syscall deprecated on MacOS --- configure.ac | 8 +------- src/httpd.c | 8 ++------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 7bd301f5..393d24f1 100644 --- a/configure.ac +++ b/configure.ac @@ -50,16 +50,10 @@ AC_CHECK_HEADERS([sys/wait.h sys/param.h dirent.h getopt.h stdint.h], [], [AC_MSG_ERROR([[Missing header required to build OwnTone]])]) AC_CHECK_HEADERS([time.h], [], [AC_MSG_ERROR([[Missing header required to build OwnTone]])]) -AC_CHECK_FUNCS_ONCE([posix_fadvise pipe2 syscall]) +AC_CHECK_FUNCS_ONCE([posix_fadvise pipe2 gettid]) AC_CHECK_FUNCS([strptime strtok_r], [], [AC_MSG_ERROR([[Missing function required to build OwnTone]])]) -dnl FreeBSD doesn't have SYS_gettid -AC_CHECK_DECL([SYS_gettid], - [AC_DEFINE([HAVE_SYS_GETTID], 1, - [Define to 1 if SYS_gettid exists])], - [], [#include ]) - dnl check for clock_gettime or replace it AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], 1, diff --git a/src/httpd.c b/src/httpd.c index 58571aba..c6935611 100644 --- a/src/httpd.c +++ b/src/httpd.c @@ -34,10 +34,6 @@ #include #include -#ifdef HAVE_SYS_GETTID -#include // get thread ID -#endif - #include #include @@ -884,8 +880,8 @@ request_async_cb(void *arg) { struct httpd_request *hreq = *(struct httpd_request **)arg; -#if defined(HAVE_SYSCALL) && defined(HAVE_SYS_GETTID) - DPRINTF(E_DBG, hreq->module->logdomain, "%s request '%s' in worker thread %ld\n", hreq->module->name, hreq->uri, syscall(SYS_gettid)); +#ifdef HAVE_GETTID + DPRINTF(E_DBG, hreq->module->logdomain, "%s request '%s' in worker thread %d\n", hreq->module->name, hreq->uri, (int)gettid()); #endif // Some handlers require an evbase to schedule events