X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Fcompiler.h;h=5b994076f47c913b28d636ae6e7262261befe103;hb=d3d3857f678627e7bbfb5a8d6f3bc15cd2a694d9;hp=827ec1fd6eee0d00d5e863f9268fa89b7ae2d59e;hpb=67988e204d2c471b24cae61f3f8fedb4f9375034;p=urcu.git

diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h
index 827ec1f..5b99407 100644
--- a/include/urcu/compiler.h
+++ b/include/urcu/compiler.h
@@ -1,22 +1,12 @@
+// SPDX-FileCopyrightText: 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #ifndef _URCU_COMPILER_H
 #define _URCU_COMPILER_H
 
 /*
- * compiler.h
- *
  * Compiler definitions.
- *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
  */
 
 #include <stddef.h>	/* for offsetof */
@@ -74,6 +64,23 @@
 		(type *)((char *)__ptr - offsetof(type, member));	\
 	})
 
+/*
+ * caa_container_of_check_null - Get the address of an object containing a field.
+ *
+ * @ptr: pointer to the field.
+ * @type: type of the object.
+ * @member: name of the field within the object.
+ *
+ * Return the address of the object containing the field. Return NULL if
+ * @ptr is NULL.
+ */
+#define caa_container_of_check_null(ptr, type, member)			\
+	__extension__							\
+	({								\
+		const __typeof__(((type *) NULL)->member) * __ptr = (ptr); \
+		(__ptr) ? (type *)((char *)__ptr - offsetof(type, member)) : NULL; \
+	})
+
 #define CAA_BUILD_BUG_ON_ZERO(cond) (sizeof(struct { int:-!!(cond); }))
 #define CAA_BUILD_BUG_ON(cond) ((void)CAA_BUILD_BUG_ON_ZERO(cond))
 
@@ -123,30 +130,4 @@
 				+ __GNUC_PATCHLEVEL__)
 #endif
 
-#ifdef __cplusplus
-#define caa_unqual_scalar_typeof(x)					\
-	std::remove_cv<std::remove_reference<decltype(x)>::type>::type
-#else
-#define caa_scalar_type_to_expr(type)					\
-	unsigned type: (unsigned type)0,				\
-	signed type: (signed type)0
-
-/*
- * Use C11 _Generic to express unqualified type from expression. This removes
- * volatile qualifier from expression type.
- */
-#define caa_unqual_scalar_typeof(x)					\
-	__typeof__(							\
-		_Generic((x),						\
-			char: (char)0,					\
-			caa_scalar_type_to_expr(char),			\
-			caa_scalar_type_to_expr(short),		\
-			caa_scalar_type_to_expr(int),			\
-			caa_scalar_type_to_expr(long),			\
-			caa_scalar_type_to_expr(long long),		\
-			default: (x)					\
-		)							\
-	)
-#endif
-
 #endif /* _URCU_COMPILER_H */