From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6DA8F469EB for ; Wed, 2 Aug 2023 07:03:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92CF968C59A; Wed, 2 Aug 2023 10:03:09 +0300 (EEST) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3698168C534 for ; Wed, 2 Aug 2023 10:03:03 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-4fe44955decso739546e87.1 for ; Wed, 02 Aug 2023 00:03:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20221208.gappssmtp.com; s=20221208; t=1690959782; x=1691564582; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Qz15SY+Dv1V3AT+R94JpoYSogzn8Tqte/sMHhOm9LAE=; b=iCPcm4EyiS3mwkCVhsa0Y+1Q7inexlyt4NjTakh6Bj2IVypu4ENH1epXjNA0bVbAv8 HBLXaYepgBTXCVMQyRdqPLgVCReD69kZz5Yxg7Q7TNmAwGpc8IOiXGLIeIM8gLWeLy/d QIE72nVIU0W6GOyp76MXqi9mHG8/ZquhvwgIEV0aMSPWCdVW2Wik4ek6IfPkyI04od/w tFX/TEm6F4kAVxaXn41OaeakJuO3IX8Bj4wiRAVg32/SO5D/TpXN4tGl++6CDeL+i92d Lrtlkr3msZQi8xPskNpij+I2HBG4ngDZbneikJ7l0g/1Qy2WOy66fi7CYQ6XAERLZwbJ Pw5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690959782; x=1691564582; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Qz15SY+Dv1V3AT+R94JpoYSogzn8Tqte/sMHhOm9LAE=; b=gNzYdohvQkA5TSD49JlYByfZZN4nrokk+RHuOavukpuvUyiXQvqGsYYtKz6JlVb9bK uR4cmZcJBB1CxgkDEHQYTisokha1HygSFyxG+Q1Q1XBySwPCIKVGQIuttODdD4wZi6N5 CE65/BBb63WibrvCc3OkSsNPLXv4MCUGszGrJGTdEyYgolylfTlF8TdPo+6K2pshuFDt aZYeYy2sF16mMiPhVAri9SVOyVlW5B+hiSGBJjXPKCOMLIao0pkDrctVtUIdVC47TSOI S6YK7TYwX2wXeckuQ6oB+qhVX4X4L/enP68lsWq0w02eWYFzsoJed0hN50edssCHB/zJ TwbQ== X-Gm-Message-State: ABy/qLYN+OIBm4hb9KwVucN9wpsfG9ZlO83Xu5tdUe7VuOaxZnFSyMNs l9M2EWUhPtxlusrgz2CqX67FfVFWoM5uHSF1OK46Xw== X-Google-Smtp-Source: APBJJlG/al+J8vox/X9wQuThRXJC+DkBHP4esu0CGq9hz/ExzA44g/vUyX1S20qj7bL05Q1NH8K1Tg== X-Received: by 2002:a05:6512:3e0e:b0:4f8:6d9d:abe0 with SMTP id i14-20020a0565123e0e00b004f86d9dabe0mr2422074lfv.33.1690959782421; Wed, 02 Aug 2023 00:03:02 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id w14-20020ac2442e000000b004fe2503e31bsm2097724lfl.157.2023.08.02.00.03.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 00:03:02 -0700 (PDT) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 10:03:01 +0300 Message-Id: <20230802070301.31623-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] w32pthreads: Fix function signature mismatches for CreateThread 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: In WinRT mode, we use CreateThread instead of _beginthreadex. CreateThread takes a LPTHREAD_START_ROUTINE function pointer, which has got the signature DWORD WINAPI ThreadProc(LPVOID). _beginthreadex takes a function with the signature unsigned __stdcall func(void *). DWORD is defined as an unsigned long, which is different type from unsigned int, even if they have the same size on Windows. This fixes build failures with Clang 16 and newer, where function pointer type mismatches are a fatal error by default. --- compat/w32pthreads.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 6405e72b64..dae8d9420d 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -66,7 +66,14 @@ typedef CONDITION_VARIABLE pthread_cond_t; #define PTHREAD_CANCEL_ENABLE 1 #define PTHREAD_CANCEL_DISABLE 0 -static av_unused unsigned __stdcall attribute_align_arg win32thread_worker(void *arg) +#if HAVE_WINRT +#define THREADFUNC_RETTYPE DWORD +#else +#define THREADFUNC_RETTYPE unsigned +#endif + +static av_unused THREADFUNC_RETTYPE +__stdcall attribute_align_arg win32thread_worker(void *arg) { pthread_t *h = (pthread_t*)arg; h->ret = h->func(h->arg); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".