diff options
Diffstat (limited to 'Utilities/cmliblzma/common')
| -rw-r--r-- | Utilities/cmliblzma/common/sysdefs.h | 4 | ||||
| -rw-r--r-- | Utilities/cmliblzma/common/tuklib_integer.h | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Utilities/cmliblzma/common/sysdefs.h b/Utilities/cmliblzma/common/sysdefs.h index 5ea6bdae4a..5beda5c2e5 100644 --- a/Utilities/cmliblzma/common/sysdefs.h +++ b/Utilities/cmliblzma/common/sysdefs.h @@ -20,9 +20,7 @@ // Includes // ////////////// -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include "config.h" // Get standard-compliant stdio functions under MinGW and MinGW-w64. #ifdef __MINGW32__ diff --git a/Utilities/cmliblzma/common/tuklib_integer.h b/Utilities/cmliblzma/common/tuklib_integer.h index e6daa772d5..1897438aa0 100644 --- a/Utilities/cmliblzma/common/tuklib_integer.h +++ b/Utilities/cmliblzma/common/tuklib_integer.h @@ -41,7 +41,15 @@ #ifndef TUKLIB_INTEGER_H #define TUKLIB_INTEGER_H -#include "tuklib_common.h" +#include "sysdefs.h" + +#if defined(__GNUC__) && defined(__GNUC_MINOR__) +# define TUKLIB_GNUC_REQ(major, minor) \ + ((__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)) \ + || __GNUC__ > (major)) +#else +# define TUKLIB_GNUC_REQ(major, minor) 0 +#endif //////////////////////////////////////// |