diff options
Diffstat (limited to 'sysutils/libdnf/files')
-rw-r--r-- | sysutils/libdnf/files/patch-libdnf_config.h | 25 | ||||
-rw-r--r-- | sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp | 13 |
2 files changed, 13 insertions, 25 deletions
diff --git a/sysutils/libdnf/files/patch-libdnf_config.h b/sysutils/libdnf/files/patch-libdnf_config.h index e470f65e4957..91b94fe32fad 100644 --- a/sysutils/libdnf/files/patch-libdnf_config.h +++ b/sysutils/libdnf/files/patch-libdnf_config.h @@ -1,22 +1,11 @@ ---- libdnf/config.h.orig 2021-03-07 20:35:58 UTC +--- libdnf/config.h.orig 2021-04-12 15:10:19 UTC +++ libdnf/config.h -@@ -18,7 +18,18 @@ +@@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ --#include <bits/wordsize.h> -+//#include <bits/wordsize.h> -+ -+#include <stdint.h> -+ -+#ifndef __WORDSIZE -+# if defined(UINTPTR_MAX) && defined(UINT64_MAX) && (UINTPTR_MAX == UINT64_MAX) -+# define __WORDSIZE 64 -+# else -+# define __WORDSIZE 32 -+# endif -+#endif -+ - - #if __WORDSIZE == 32 - #include "config-32.h" +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + #include <stdint.h> + #else + #include <bits/wordsize.h> diff --git a/sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp b/sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp index 081a4fdb9e8a..321c186a3265 100644 --- a/sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp +++ b/sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp @@ -1,12 +1,11 @@ ---- libdnf/hy-iutil.cpp.orig 2020-09-20 22:51:04 UTC +--- libdnf/hy-iutil.cpp.orig 2021-04-12 15:10:19 UTC +++ libdnf/hy-iutil.cpp -@@ -22,7 +22,9 @@ +@@ -22,7 +22,7 @@ #include <errno.h> #include <dirent.h> #include <fcntl.h> -+#if !defined(__FreeBSD__) +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + #include <limits.h> + #else #include <linux/limits.h> -+#endif - #include <pwd.h> - #include <unistd.h> - #include <stdio.h> |