[src/trunk]: src/sys/external/bsd/libfdt/dist Merge conflicts

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7a1433118663
branches:  trunk
changeset: 354239:7a1433118663
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Jun 08 15:54:32 2017 +0000

description:
Merge conflicts

diffstat:

 sys/external/bsd/libfdt/dist/libfdt_env.h |  29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diffs (74 lines):

diff -r 9de8c3459eda -r 7a1433118663 sys/external/bsd/libfdt/dist/libfdt_env.h
--- a/sys/external/bsd/libfdt/dist/libfdt_env.h Thu Jun 08 15:53:11 2017 +0000
+++ b/sys/external/bsd/libfdt/dist/libfdt_env.h Thu Jun 08 15:54:32 2017 +0000
@@ -1,3 +1,5 @@
+/*     $NetBSD: libfdt_env.h,v 1.3 2017/06/08 15:54:32 skrll Exp $     */
+
 #ifndef _LIBFDT_ENV_H
 #define _LIBFDT_ENV_H
 /*
@@ -58,20 +60,21 @@
 #else
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #endif
 
 #ifdef __CHECKER__
-#define __force __attribute__((force))
-#define __bitwise __attribute__((bitwise))
+#define FDT_FORCE __attribute__((force))
+#define FDT_BITWISE __attribute__((bitwise))
 #else
-#define __force
-#define __bitwise
+#define FDT_FORCE
+#define FDT_BITWISE
 #endif
 
-typedef uint16_t __bitwise fdt16_t;
-typedef uint32_t __bitwise fdt32_t;
-typedef uint64_t __bitwise fdt64_t;
+typedef uint16_t FDT_BITWISE fdt16_t;
+typedef uint32_t FDT_BITWISE fdt32_t;
+typedef uint64_t FDT_BITWISE fdt64_t;
 
 #define EXTRACT_BYTE(x, n)     ((unsigned long long)((uint8_t *)&x)[n])
 #define CPU_TO_FDT16(x) ((EXTRACT_BYTE(x, 0) << 8) | EXTRACT_BYTE(x, 1))
@@ -84,29 +87,29 @@
 
 static inline uint16_t fdt16_to_cpu(fdt16_t x)
 {
-       return (__force uint16_t)CPU_TO_FDT16(x);
+       return (FDT_FORCE uint16_t)CPU_TO_FDT16(x);
 }
 static inline fdt16_t cpu_to_fdt16(uint16_t x)
 {
-       return (__force fdt16_t)CPU_TO_FDT16(x);
+       return (FDT_FORCE fdt16_t)CPU_TO_FDT16(x);
 }
 
 static inline uint32_t fdt32_to_cpu(fdt32_t x)
 {
-       return (__force uint32_t)CPU_TO_FDT32(x);
+       return (FDT_FORCE uint32_t)CPU_TO_FDT32(x);
 }
 static inline fdt32_t cpu_to_fdt32(uint32_t x)
 {
-       return (__force fdt32_t)CPU_TO_FDT32(x);
+       return (FDT_FORCE fdt32_t)CPU_TO_FDT32(x);
 }
 
 static inline uint64_t fdt64_to_cpu(fdt64_t x)
 {
-       return (__force uint64_t)CPU_TO_FDT64(x);
+       return (FDT_FORCE uint64_t)CPU_TO_FDT64(x);
 }
 static inline fdt64_t cpu_to_fdt64(uint64_t x)
 {
-       return (__force fdt64_t)CPU_TO_FDT64(x);
+       return (FDT_FORCE fdt64_t)CPU_TO_FDT64(x);
 }
 #undef CPU_TO_FDT64
 #undef CPU_TO_FDT32