X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Fuatomic%2Fs390.h;h=42f23e757807453586831af7e8210c04e1453d44;hp=d7d545ad8f869ede493edef727233d7e9edc42ad;hb=HEAD;hpb=713234991cce999c376345400f9367f1e2317076

diff --git a/include/urcu/uatomic/s390.h b/include/urcu/uatomic/s390.h
index d7d545a..2562696 100644
--- a/include/urcu/uatomic/s390.h
+++ b/include/urcu/uatomic/s390.h
@@ -1,3 +1,8 @@
+// SPDX-FileCopyrightText: 2009 Novell, Inc.
+// SPDX-FileCopyrightText: 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: MIT
+
 #ifndef _URCU_UATOMIC_ARCH_S390_H
 #define _URCU_UATOMIC_ARCH_S390_H
 
@@ -6,27 +11,7 @@
  * taken from the Principles of Operation Appendix A "Conditional Swapping
  * Instructions (CS, CDS)".
  *
- * Copyright (c) 2009 Novell, Inc.
  * Author: Jan Blunck <jblunck@suse.de>
- * 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.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
  */
 
 #include <urcu/compiler.h>
@@ -66,10 +51,14 @@ extern "C" {
  * containing an array of char of the specified size. This allows passing the
  * @addr arguments of the following inline functions as "m" and "+m" operands
  * to the assembly. The @size parameter should be a constant to support
- * compilers such as clang which do not support VLA.
+ * compilers such as clang which do not support VLA. Create typedefs because
+ * C++ does not allow types be defined in casts.
  */
 
-#define __hp(size, x)	((struct { char v[size]; } *)(x))
+typedef struct { char v[4]; } __hp_4;
+typedef struct { char v[8]; } __hp_8;
+
+#define __hp(size, x)	((__hp_##size *)(x))
 
 /* xchg */