From patchwork Tue Feb 6 10:15:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Plowman X-Patchwork-Id: 46068 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1304145pzh; Tue, 6 Feb 2024 02:16:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZS5TMvWwmBLQ/kg+iPOoPyHNHUMWUuf+io8cHY7oT/aN1uZ9vcAoTG8k/64qGYvSj8Ohi X-Received: by 2002:a17:906:35cd:b0:a36:6f2f:7628 with SMTP id p13-20020a17090635cd00b00a366f2f7628mr2098931ejb.2.1707214579827; Tue, 06 Feb 2024 02:16:19 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWInmqys+ZB1O1MXP0MQHqorUDEKwT3UsfKOw9JtUGL46/yUzQAxOgEj1mobH2wHXkWWehcaWTuLrxWl69rc6LyCqhpUrRluimIgLwQN4A7jJCSC+owAu3O1jvCWKw0l4FH3Vw+O0MDAOYmLBr28gRwrAY8zyw5i4F2RX6TFgtu2PAUS1sseVM69eLOeKx8wIVJsX/nAYAzDAU+QDFg3wWSFKQneIwPJ7AqsAQHxugVOo0Yrek9P94uMkWGvFwCUJED+a/QFAf/vwp9MWcQK/H4VLj/8fMKugUIOqACLu3M6v1NiUPoryjgOHIv3McJzi2TgrC1hpaC279DB5elH8mqW2UyrwuCVLX4Y5R8T2feabVz65SPQTO8FXr6vnENg3mcF0ng3mz3vPHsJt1JKigcu5KdGC1ckLvntLYsd1vtPjemOFxJFg7l3c52DC6dRZs5p+hg13gBqvJWnwYOVA2UdZ3p8vlJaHiRLq/GenWkzprmfzP7y9cCrh0OcZZmjcWbharhClLtfpRfQQfaqwfpSQ7rHIKFOvLCHNI6f+MXcwwW0W3k1g5KdNbhlpL046INRSgiquysLfrm9XCRNNF2MRkIHYT/IcAJFxn2/MbMcQttWtwKSF5BtrRR7vvhu93GRdcZLfNnrvdgCtnqnhZ49z3O4d9zahz+b0R1OD/jIj4yyAvOtEuGoFhC3hzcxwJS/hQkiAhHZ7i/Qz8nQ7WDo4kZinhuuS1vppq4k09mxPK11r7ja7c3CUq0tjyhAyS7/lAbzrKaJUdKMHfWOFB5XzWrXLxoElbwkRtAVguk5plp1gqFOiKqjS0auqOrhXS9XqYiUKRKDX/ORUgBmpT09OpD24rN+pkKMakcum1jpXtpNlRI0LGX8gt/jCkR8oS4pPBsr98f4Kw8VNn9rvc5sgeBeocQGiKY8yZFnRleaqbFyz0FMAr1Q4aywoSGNsr90v IvZeDZAtPTwohWO8qRmxhmRN+/HBN3qAQ1X86KN0HTdhU4pYius1qQuD7GDg3xfpVutntvBGFnwMF51K8yp/GRMrCFwwKneYlC03IZ0p/vPTWmN8LnMsnJizdJXYFKVNezJR6XDDj6uKFQABkKPZgGhvebtmuuw8gbNKjl4QQMttXdv/rkUrabEDCjQ7o/ZYyoMTMyFcGM7lAz+wyeCmStLE5L5CK63nOY78u7JNHS7tkfrdHWndOAK+bGYtQqBMIc315j1TsTOmkndnIz68RVjehyWVH8gQZbDZeEy3I9CpbYLiYGIwo22mefSJcBaHK9UyWqE4XYBSvNwxrWSixmLlNff48kPkah4nxtXtebYiAg2+RZLPt5wDZDGE7MtXRTpLdMCuS/KnjPRjrJcJN+nOjpFCk8YdRoWq3SzHlUgvjBfAxAPYvn+u44LiNs3qnL4iJrUl1ACUsaUKSM2e8JEPQZw1p/ulAmotNdAKZl15uXtTVo1o3uAksd7tg+H70BO8rSe6ZzfiU52xYrCUK/e4xm+BbIZyGPmaTYaSm0JzSFsRPMTOBWvYcXjKyrpE9n5vmsjgCI3T70uF1paoO8uu6qo698jCDKrwjQ3yIVeEILcStBX1sKK6zlDa2UqxZC Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f13-20020a17090624cd00b00a3544c1a6ccsi905745ejb.963.2024.02.06.02.16.19; Tue, 06 Feb 2024 02:16:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@frankplowman.com header.s=zmail header.b=fwgG9lJl; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 172B468D157; Tue, 6 Feb 2024 12:16:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from sender21-mail.zoho.eu (sender11-op-o12.zoho.eu [31.186.226.226]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A75E968D140 for ; Tue, 6 Feb 2024 12:16:10 +0200 (EET) Delivered-To: post@frankplowman.com ARC-Seal: i=1; a=rsa-sha256; t=1707214568; cv=none; d=zohomail.eu; s=zohoarc; b=QG2BhwsbEmfbN5p5qw94+L7koVHp9UxXbQFJl5u1qFyyMKYrC44BGsfKCiT5aa8BH+azUCDd+0reJ90mJlgwdSrdwXExFjUVnA//9+5hzsBbMRb2CdT5Vt82/tAY1a+35uCZv/oSsde9xvmVCtwdKQ8gmY8mJ6qpnogUHcW+Tpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1707214568; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=dh4h9QzvkZybz6tuKn5XnPE47TGWEYgDWFK/Qok50VA=; b=GserA9Xxf85vYCOD3t/lqHlZrBqBQcafMHiDDPV43BYSGOqryhf098X6YXTOVY6pgDfgjub2g1PwBHGzn7q0iB2vwe14+8iGR6b+itsiLgstEpkP57qFWRjvHDMU2sd7hy6o2de6JU/YxK2zm7tiocPixTaFp41w7q4AH33T2aw= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=frankplowman.com; spf=pass smtp.mailfrom=post@frankplowman.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1707214568; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=dh4h9QzvkZybz6tuKn5XnPE47TGWEYgDWFK/Qok50VA=; b=fwgG9lJlgedQBWlz+ufzc6u4T95QnFQvTOjsOXmOqxSvC/n7fheXmkS4JPE4xAW0 triOPWgvqxJOhz7+jRor/Rj3ghYg2wsz6JvHikoyVT/o+4rjPfjpACxNEvTVurfZxVt 7wakTYelVyHOuHbgh14fY7s53A5OEL0DbrdxDIjE= Received: from localhost.localdomain (frankplowman.com [51.89.148.29]) by mx.zoho.eu with SMTPS id 1707214566337668.4282996669176; Tue, 6 Feb 2024 11:16:06 +0100 (CET) From: post@frankplowman.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 10:15:52 +0000 Message-ID: <20240206101552.28897-1-post@frankplowman.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-ZohoMailClient: External Subject: [FFmpeg-devel] [PATCH] lavu/thread: Check HAVE_PTHREAD_SET_?NAME_NP is defined X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Frank Plowman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xWEwefU/Jg3k From: Frank Plowman Check HAVE_PTHREAD_SETNAME_NP and HAVE_PTHREAD_SET_NAME_NP are defined before using them in macro conditions. Gets rid of lots of -Wundef warnings present when building on MacOS since fd16d8c68cd7b820eda76c407b0645b7cf470efd. Signed-off-by: Frank Plowman --- libavutil/thread.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavutil/thread.h b/libavutil/thread.h index 2c00c7cc35..0200b7b511 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -26,7 +26,9 @@ #if HAVE_PRCTL #include -#elif (HAVE_PTHREAD_SETNAME_NP || HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_NP_H +#elif ((defined(HAVE_PTHREAD_SETNAME_NP) && HAVE_PTHREAD_SETNAME_NP) \ + || (defined(HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_SET_NAME_NP)) \ + && HAVE_PTHREAD_NP_H #include #endif @@ -219,7 +221,7 @@ static inline int ff_thread_setname(const char *name) #if HAVE_PRCTL ret = AVERROR(prctl(PR_SET_NAME, name)); -#elif HAVE_PTHREAD_SETNAME_NP +#elif defined(HAVE_PTHREAD_SETNAME_NP) && HAVE_PTHREAD_SETNAME_NP #if defined(__APPLE__) ret = AVERROR(pthread_setname_np(name)); #elif defined(__NetBSD__) @@ -227,7 +229,7 @@ static inline int ff_thread_setname(const char *name) #else ret = AVERROR(pthread_setname_np(pthread_self(), name)); #endif -#elif HAVE_PTHREAD_SET_NAME_NP +#elif defined(HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_SET_NAME_NP pthread_set_name_np(pthread_self(), name); #else ret = AVERROR(ENOSYS);