[PATCH 2/9] lib: crypt: Avoid redefining static_assert

Pierre-Clément Tosi ptosi at google.com
Wed Mar 16 16:39:41 CET 2022


Use the macro introduced by commit ef0f4e834c66 ("build_bug.h: add
wrapper for _Static_assert") by importing <linux/build_bug.h>.

Signed-off-by: Pierre-Clément Tosi <ptosi at google.com>
Cc: Simon Glass <sjg at chromium.org>
Cc: Steffen Jaeckel <jaeckel-floss at eyet-services.de>
---
 lib/crypt/crypt-port.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/crypt/crypt-port.h b/lib/crypt/crypt-port.h
index 6b9542d75b..e85d3c132c 100644
--- a/lib/crypt/crypt-port.h
+++ b/lib/crypt/crypt-port.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /* Copyright (C) 2020 Steffen Jaeckel <jaeckel-floss at eyet-services.de> */
 
+#include <linux/build_bug.h>
 #include <linux/types.h>
 #include <vsprintf.h>
 
@@ -10,8 +11,6 @@
 
 #define ARG_UNUSED(x) (x)
 
-#define static_assert(a, b) _Static_assert(a, b)
-
 #define strtoul(cp, endp, base) simple_strtoul(cp, endp, base)
 
 extern const unsigned char ascii64[65];
-- 
2.35.1.723.g4982287a31-goog



More information about the U-Boot mailing list