[PATCH v7 06/14] clar: stop including `shellapi.h` unnecessarily
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Sep 3, 2024, 09:14 UTC
- Message-ID
- <c50e7a0ea68ba6fb4ef669403f79d3217d242f9f.1725349234.git.ps@pks.im>
- In-Reply-To
- <cover.1725349234.git.ps@pks.im>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
The `shellapi.h` header was included as of https://github.com/clar-test/clar/commit/136e763211aa, to have `SHFileOperation()` declared so that it could be called.
However, https://github.com/clar-test/clar/commit/5ce31b69b525 removed that call, and therefore that `#include <shellapi.h>` is unnecessary.
It is also unwanted in Git because this project uses a subset of Git for Windows' SDK in its CI builds that (for bandwidth reasons) excludes tons of header files, including `shellapi.h`.
So let's remove it.
Note: Since the `windows.h` header would include `shellapi.h` anyway, we also define `WIN32_LEAN_AND_MEAN` to avoid this and similar other unnecessary includes before including `windows.h`.
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 e2ebe551d38..cef0f023c24 100644 --- a/t/unit-tests/clar/clar.c +++ b/t/unit-tests/clar/clar.c @@ -19,9 +19,9 @@ #include <sys/stat.h> #ifdef _WIN32 +# define WIN32_LEAN_AND_MEAN # include <windows.h> # include <io.h> -# include <shellapi.h> # include <direct.h> # define _MAIN_CC __cdecl
-- 2.46.0.421.g159f2d50e7.dirty