lkml.org 
[lkml]   [2019]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] static_assert: move before people start using it
Userspace places static_assert() macro at <assert.h>

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

include/assert.h | 19 +++++++++++++++++++
include/linux/build_bug.h | 19 -------------------
include/linux/fs.h | 2 +-
lib/vsprintf.c | 1 +
4 files changed, 21 insertions(+), 20 deletions(-)

new file mode 100644
--- /dev/null
+++ b/include/assert.h
@@ -0,0 +1,19 @@
+#pragma once
+/**
+ * static_assert - check integer constant expression at build time
+ *
+ * static_assert() is a wrapper for the C11 _Static_assert, with a
+ * little macro magic to make the message optional (defaulting to the
+ * stringification of the tested expression).
+ *
+ * Contrary to BUILD_BUG_ON(), static_assert() can be used at global
+ * scope, but requires the expression to be an integer constant
+ * expression (i.e., it is not enough that __builtin_constant_p() is
+ * true for expr).
+ *
+ * Also note that BUILD_BUG_ON() fails the build if the condition is
+ * true, while static_assert() fails the build if the expression is
+ * false.
+ */
+#define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
+#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
--- a/include/linux/build_bug.h
+++ b/include/linux/build_bug.h
@@ -58,23 +58,4 @@
*/
#define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")

-/**
- * static_assert - check integer constant expression at build time
- *
- * static_assert() is a wrapper for the C11 _Static_assert, with a
- * little macro magic to make the message optional (defaulting to the
- * stringification of the tested expression).
- *
- * Contrary to BUILD_BUG_ON(), static_assert() can be used at global
- * scope, but requires the expression to be an integer constant
- * expression (i.e., it is not enough that __builtin_constant_p() is
- * true for expr).
- *
- * Also note that BUILD_BUG_ON() fails the build if the condition is
- * true, while static_assert() fails the build if the expression is
- * false.
- */
-#define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
-#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
-
#endif /* _LINUX_BUILD_BUG_H */
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _LINUX_FS_H
#define _LINUX_FS_H
-
+#include <assert.h>
#include <linux/linkage.h>
#include <linux/wait_bit.h>
#include <linux/kdev_t.h>
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -16,6 +16,7 @@
* - scnprintf and vscnprintf
*/

+#include <assert.h>
#include <stdarg.h>
#include <linux/build_bug.h>
#include <linux/clk.h>
\
 
 \ /
  Last update: 2019-03-10 11:52    [W:0.061 / U:11.056 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site