From 7834108dfef0fd800050be264005317a4020bb14 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sat, 30 Sep 2023 22:54:28 +0300 Subject: [PATCH] liblzma: Refer to MinGW-w64 instead of MinGW in the API headers. MinGW (formely a MinGW.org Project, later the MinGW.OSDN Project at ) has GCC 9.2.0 as the most recent GCC package (released 2021-02-02). The project might still be alive but majority of people have switched to MinGW-w64. Thus it seems clearer to refer to MinGW-w64 in our API headers too. Building with MinGW is likely to still work but I haven't tested it in the recent years. (cherry picked from commit 5b9e16764905d06fa8e8339ba185ddfee304e5fb) --- src/liblzma/api/lzma.h | 4 ++-- src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/liblzma/api/lzma.h b/src/liblzma/api/lzma.h index 33f91121..f196f495 100644 --- a/src/liblzma/api/lzma.h +++ b/src/liblzma/api/lzma.h @@ -181,11 +181,11 @@ * against static liblzma on them, don't worry about LZMA_API_STATIC. That * is, most developers will never need to use LZMA_API_STATIC. * - * The GCC variants are a special case on Windows (Cygwin and MinGW). + * The GCC variants are a special case on Windows (Cygwin and MinGW-w64). * We rely on GCC doing the right thing with its auto-import feature, * and thus don't use __declspec(dllimport). This way developers don't * need to worry about LZMA_API_STATIC. Also the calling convention is - * omitted on Cygwin but not on MinGW. + * omitted on Cygwin but not on MinGW-w64. */ #ifndef LZMA_API_IMPORT # if !defined(LZMA_API_STATIC) && defined(_WIN32) && !defined(__GNUC__) diff --git a/src/liblzma/api/lzma/version.h b/src/liblzma/api/lzma/version.h index cfdf9bf9..158516c2 100644 --- a/src/liblzma/api/lzma/version.h +++ b/src/liblzma/api/lzma/version.h @@ -95,7 +95,7 @@ LZMA_VERSION_COMMIT) -/* #ifndef is needed for use with windres (MinGW or Cygwin). */ +/* #ifndef is needed for use with windres (MinGW-w64 or Cygwin). */ #ifndef LZMA_H_INTERNAL_RC /**