build2-packaging/libbuild2-autoconf
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

Fix BUILD2_AUTOCONF_MINGW_PREREQ(maj, min)

Browse Source
This commit is contained in:
Francois Kritzinger 2022-09-14 16:33:38 +02:00
parent 664f5a752b
commit 69a28ea364
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libbuild2-autoconf/libbuild2/autoconf/checks/BUILD2_AUTOCONF_LIBC_VERSION.h
View File

@ -99,8 +99,8 @@
* __MINGW64__: Defined if on Mingw-w64, 64-bit only. This is a predefined * __MINGW64__: Defined if on Mingw-w64, 64-bit only. This is a predefined
* macro so no header needs to be included. * macro so no header needs to be included.
* *
* __MINGW64_MAJOR_VERSION: * __MINGW64_VERSION_MAJOR:
* __MINGW64_MINOR_VERSION: The Mingw-w64 major/minor version numbers. Note * __MINGW64_VERSION_MINOR: The Mingw-w64 major/minor version numbers. Note
* that these are defined for both 32 and 64-bit. * that these are defined for both 32 and 64-bit.
*/ */
#if defined(__linux__) #if defined(__linux__)
@ -115,7 +115,7 @@
#elif defined(__APPLE__) #elif defined(__APPLE__)
# include <Availability.h> /* __MAC_OS_X_VERSION_MIN_REQUIRED */ # include <Availability.h> /* __MAC_OS_X_VERSION_MIN_REQUIRED */
#elif defined(__MINGW32__) #elif defined(__MINGW32__)
# include <_mingw.h> /* __MINGW64_{MAJOR,MINOR}_VERSION */ # include <_mingw.h> /* __MINGW64_VERSION_{MAJOR,MINOR} */
#endif #endif
/* BUILD2_AUTOCONF_GLIBC_PREREQ(maj, min) /* BUILD2_AUTOCONF_GLIBC_PREREQ(maj, min)
@ -212,11 +212,11 @@
* Return 1 if the Mingw-w64 version is >= the given version number, or 0 * Return 1 if the Mingw-w64 version is >= the given version number, or 0
* otherwise. * otherwise.
*/ */
#if defined(__MINGW64_MAJOR_VERSION) && defined(__MINGW64_MINOR_VERSION) #if defined(__MINGW64_VERSION_MAJOR) && defined(__MINGW64_VERSION_MINOR)
# define BUILD2_AUTOCONF_MINGW_PREREQ(maj, min) \ # define BUILD2_AUTOCONF_MINGW_PREREQ(maj, min) \
(__MINGW64_MAJOR_VERSION > (maj) || \ (__MINGW64_VERSION_MAJOR > (maj) || \
(__MINGW64_MAJOR_VERSION == (maj) && \ (__MINGW64_VERSION_MAJOR == (maj) && \
__MINGW64_MINOR_VERSION >= (min))) __MINGW64_VERSION_MINOR >= (min)))
#else #else
# define BUILD2_AUTOCONF_MINGW_PREREQ(maj, min) 0 # define BUILD2_AUTOCONF_MINGW_PREREQ(maj, min) 0
#endif #endif