William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 1 | From fc0b81bb717db3f41513f09f6661676a7aea6dd4 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 9 Mar 2021 19:30:42 +0000 |
| 4 | Subject: [PATCH] libdnf/config.h: avoid the use of non-portable __WORDSIZE |
| 5 | |
| 6 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1159] |
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 8 | |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 9 | --- |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 10 | libdnf/config.h | 9 +++------ |
| 11 | 1 file changed, 3 insertions(+), 6 deletions(-) |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 12 | |
| 13 | diff --git a/libdnf/config.h b/libdnf/config.h |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 14 | index 01b330b4..dbd53f5e 100644 |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 15 | --- a/libdnf/config.h |
| 16 | +++ b/libdnf/config.h |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 17 | @@ -20,14 +20,11 @@ |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 18 | |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 19 | #ifdef __APPLE__ |
| 20 | #include <stdint.h> |
| 21 | -#else |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 22 | -#include <bits/wordsize.h> |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 23 | #endif |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 24 | +#include <limits.h> |
| 25 | |
| 26 | -#if __WORDSIZE == 32 |
| 27 | -#include "config-32.h" |
| 28 | -#elif __WORDSIZE == 64 |
| 29 | +#if (ULONG_MAX == 0xffffffffffffffff) |
| 30 | #include "config-64.h" |
| 31 | #else |
| 32 | -#error "Unknown word size" |
| 33 | +#include "config-32.h" |
| 34 | #endif |