[v7,04/14] clar: avoid compile error with mingw-w64

Message ID	658a601c5411f38457007ed961582b5d898f813a.1725349234.git.ps@pks.im (mailing list archive)
State	Superseded
Headers	show Received: from pfhigh7-smtp.messagingengine.com (fhigh7-smtp.messagingengine.com [103.168.172.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20F601A3AA4 for <git@vger.kernel.org>; Tue, 3 Sep 2024 09:14:49 +0000 (UTC) Feedback-ID: i197146af:Fastmail Date: Tue, 3 Sep 2024 11:14:43 +0200 From: Patrick Steinhardt <ps@pks.im> To: git@vger.kernel.org Cc: =?utf-8?b?UmVuw6k=?= Scharfe <l.s.r@web.de>, Junio C Hamano <gitster@pobox.com>, Kyle Lippincott <spectral@google.com>, Phillip Wood <phillip.wood@dunelm.org.uk>, Josh Steadmon <steadmon@google.com>, rsbecker@nexbridge.com, Edward Thomson <ethomson@edwardthomson.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de> Subject: [PATCH v7 04/14] clar: avoid compile error with mingw-w64 Message-ID: <658a601c5411f38457007ed961582b5d898f813a.1725349234.git.ps@pks.im> References: <cover.1722415748.git.ps@pks.im> <cover.1725349234.git.ps@pks.im> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <cover.1725349234.git.ps@pks.im>
Series	Introduce clar testing framework \| expand [v7,00/14] Introduce clar testing framework [v7,01/14] t: do not pass GIT_TEST_OPTS to unit tests with prove [v7,02/14] t: import the clar unit testing framework [v7,03/14] t/clar: fix compatibility with NonStop [v7,04/14] clar: avoid compile error with mingw-w64 [v7,05/14] clar(win32): avoid compile error due to unused `fs_copy()` [v7,06/14] clar: stop including `shellapi.h` unnecessarily [v7,07/14] Makefile: fix sparse dependency on GENERATED_H [v7,08/14] Makefile: make hdr-check depend on generated headers [v7,09/14] Makefile: do not use sparse on third-party sources [v7,10/14] Makefile: wire up the clar unit testing framework [v7,11/14] t/unit-tests: implement test driver [v7,12/14] t/unit-tests: convert strvec tests to use clar [v7,13/14] t/unit-tests: convert ctype tests to use clar [v7,14/14] clar: add CMake support

Message ID

658a601c5411f38457007ed961582b5d898f813a.1725349234.git.ps@pks.im (mailing list archive)

State

Superseded

Headers

Feedback-ID: i197146af:Fastmail
Date: Tue, 3 Sep 2024 11:14:43 +0200
From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Cc: =?utf-8?b?UmVuw6k=?= Scharfe <l.s.r@web.de>,
 Junio C Hamano <gitster@pobox.com>, Kyle Lippincott <spectral@google.com>,
 Phillip Wood <phillip.wood@dunelm.org.uk>,
 Josh Steadmon <steadmon@google.com>, rsbecker@nexbridge.com,
 Edward Thomson <ethomson@edwardthomson.com>,
 Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH v7 04/14] clar: avoid compile error with mingw-w64
Message-ID: 
 <658a601c5411f38457007ed961582b5d898f813a.1725349234.git.ps@pks.im>
References: <cover.1722415748.git.ps@pks.im>
 <cover.1725349234.git.ps@pks.im>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <cover.1725349234.git.ps@pks.im>

Series

Introduce clar testing framework | expand

Commit Message

Patrick Steinhardt Sept. 3, 2024, 9:14 a.m. UTC

From: Johannes Schindelin <johannes.schindelin@gmx.de>

When using mingw-w64 to compile the code, and using `_stat()`, it is
necessary to use `struct _stat`, too, and not `struct stat` (as the
latter is incompatible with the "dashed" version because it is limited
to 32-bit time types for backwards compatibility).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 t/unit-tests/clar/clar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/unit-tests/clar/clar.c b/t/unit-tests/clar/clar.c
index 3fc2c768158..e2ebe551d38 100644
--- a/t/unit-tests/clar/clar.c
+++ b/t/unit-tests/clar/clar.c
@@ -68,7 +68,7 @@ 
 #		define PRIxZ "Ix"
 #	endif
 
-#	if defined(_MSC_VER) || defined(__MINGW32__)
+#	if defined(_MSC_VER) || (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
 	typedef struct stat STAT_T;
 #	else
 	typedef struct _stat STAT_T;

[v7,04/14] clar: avoid compile error with mingw-w64

Commit Message

Patch