git: cc273d9909a2 - stable/12 - MFC r368329 and r368341: Fix definition of int64_t and uint64_t when long is 64-bit. This gets the kernel shim code in line with the rest of the kernel, sys/x86/include/_types.h.
Hans Petter Selasky
hselasky at FreeBSD.org
Mon Dec 28 13:16:01 UTC 2020
The branch stable/12 has been updated by hselasky:
URL: https://cgit.FreeBSD.org/src/commit/?id=cc273d9909a2ab19b1bfe7900cc0cc0a9959f41b
commit cc273d9909a2ab19b1bfe7900cc0cc0a9959f41b
Author: Hans Petter Selasky <hselasky at FreeBSD.org>
AuthorDate: 2020-12-04 14:50:55 +0000
Commit: Hans Petter Selasky <hselasky at FreeBSD.org>
CommitDate: 2020-12-28 13:15:34 +0000
MFC r368329 and r368341:
Fix definition of int64_t and uint64_t when long is 64-bit. This gets the kernel
shim code in line with the rest of the kernel, sys/x86/include/_types.h.
Sponsored by: Mellanox Technologies // NVIDIA Networking
---
stand/kshim/bsd_kernel.h | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h
index 4dfe307fef0c..1297eddc69a1 100644
--- a/stand/kshim/bsd_kernel.h
+++ b/stand/kshim/bsd_kernel.h
@@ -205,9 +205,17 @@ typedef unsigned int uint32_t;
#define _INT32_T_DECLARED
typedef signed int int32_t;
#define _UINT64_T_DECLARED
+#ifndef __LP64__
typedef unsigned long long uint64_t;
-#define _INT16_T_DECLARED
+#else
+typedef unsigned long uint64_t;
+#endif
+#define _INT64_T_DECLARED
+#ifndef __LP64__
typedef signed long long int64_t;
+#else
+typedef signed long int64_t;
+#endif
typedef uint16_t uid_t;
typedef uint16_t gid_t;
More information about the dev-commits-src-all
mailing list