From patchwork Sat Apr 3 21:53:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 26732 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CDEB044A70F for ; Sun, 4 Apr 2021 00:53:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A82D168AA98; Sun, 4 Apr 2021 00:53:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E0F268AA4A for ; Sun, 4 Apr 2021 00:53:45 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id b14so12177523lfv.8 for ; Sat, 03 Apr 2021 14:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Yjxr31pmw8qbjihYxbyhQkCD6zwN5hlhtfDWls89zsQ=; b=1sXRa4oGhv3yVbKziarr5u8sBN+w7aqdyKbfAQcCZXqEV+xbtl+funX6iZGkiJe6xf NuILkSKWFxCSdFxySs2RVum7YCXms+ePqm8ecFuWlm39EeZruIzfEmlvZHK6as1zROkT 5CxBCBawIi8Vh1pCUJqNRn9viOpB3xzjdDv1Uc4Ill8J3wbDaxAR8zWxodee7Dnwdors kvb3nXY3YAe1SFIyYCcRRS1kUxUKSVK+TWcD3rkiD5vxI0EN9gHu65rqa19C6lu5s5Bz qwdWL/ewX5W6S/Klp6x151vj9DojZnq/hQ+lsUg7/b9QU4Tn1eAp8lD35S8K1URbjOw1 z/EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Yjxr31pmw8qbjihYxbyhQkCD6zwN5hlhtfDWls89zsQ=; b=qoIihJ0CMGwBC6R3iYxPk/0c6DQyeN1b24ojAQJE5A/EBty9MfB1O288zrNEz/2x4j m6GO3jJKvdOBYuPB4ZmoY3gvW+irLthX+v4KZffoqsQJy3W2VgToy9MSFP2kagy5wcHR 8GmxadShmklOZnOAcdA6KqzC4cIoSewGrck1zDxDlBhIa0zB0zppZhIxlZloPYJFNvr7 y7yGhLCl69ls5QFcp/gKia2ZkbTu/jA/eOAkRJYZSmeUxMsZUVFz0mhNmkINBXTGtx3s 0r22YkNP+8y55bvY+k9TczapIUbMigDcbm6CJWsUm53BAM+G2uE5BkaJ3gjhrknciX3x ZqkA== X-Gm-Message-State: AOAM532/soP5YE27OTxC7/tKm0ks40aU/kkJNbA14zPMkldFYugI5bVe aHETBnFrIWWCJG7IjFXV1BKkH28GT/yKb9Jq X-Google-Smtp-Source: ABdhPJzj0jXwDRIS+3MUf7zAXf7uXIag1BlChQS2BnqqCyu1m2EaoCFcHnwQlOR8kdmSrRaHP5pe9g== X-Received: by 2002:a05:6512:203a:: with SMTP id s26mr12864951lfs.535.1617486824691; Sat, 03 Apr 2021 14:53:44 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id x17sm1246582lfg.164.2021.04.03.14.53.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Apr 2021 14:53:44 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Apr 2021 00:53:43 +0300 Message-Id: <20210403215343.2127885-1-martin@martin.st> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] atomics: Fix the win32 atomic_exchange function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes building with MSVC after a2a38b160620d91bc3f895dadc4501c589998b9c. Remove the stray semicolon, and add casts for the input argument (which is an intptr_t*) to the right type (void *volatile *). --- Changed to use PVOID. --- compat/atomics/win32/stdatomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/atomics/win32/stdatomic.h b/compat/atomics/win32/stdatomic.h index bb8e6e7e15..28a627bfd3 100644 --- a/compat/atomics/win32/stdatomic.h +++ b/compat/atomics/win32/stdatomic.h @@ -96,7 +96,7 @@ do { \ atomic_load(object) #define atomic_exchange(object, desired) \ - InterlockedExchangePointer(object, desired); + InterlockedExchangePointer((PVOID volatile *)object, (PVOID)desired) #define atomic_exchange_explicit(object, desired, order) \ atomic_exchange(object, desired)