From 9e6e39c3512f7a962c44dc3729c98a0f8be90341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 8 Apr 2020 13:28:13 +0900 Subject: Merge pull request #2991 from shyouhei/ruby.h Split ruby.h --- internal/static_assert.h | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'internal/static_assert.h') diff --git a/internal/static_assert.h b/internal/static_assert.h index 6fe18d1261..7b20b252d2 100644 --- a/internal/static_assert.h +++ b/internal/static_assert.h @@ -1,28 +1,13 @@ -#ifndef INTERNAL_STATIC_ASSERT_H /* -*- C -*- */ -#define INTERNAL_STATIC_ASSERT_H -/** +/** \noop-*-C-*-vi:ft=c * @file - * @brief C11 shim for _Static_assert. - * @author \@shyouhei + * @author Ruby developers * @copyright This file is a part of the programming language Ruby. * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. + * @brief C11 shim for _Static_assert. */ -#include /* for static_assert */ -#include "compilers.h" /* for __has_extension */ - -#if defined(static_assert) -/* Take assert.h definition */ -# define STATIC_ASSERT(name, expr) static_assert(expr, # name ": " # expr) - -#elif __has_extension(c_static_assert) || GCC_VERSION_SINCE(4, 6, 0) -# define STATIC_ASSERT(name, expr) \ - __extension__ _Static_assert(expr, # name ": " # expr) - -#else -# define STATIC_ASSERT(name, expr) \ - typedef int static_assert_ ## name ## _check[1 - 2 * !(expr)] - -#endif /* static_assert */ -#endif /* INTERNAL_STATIC_ASSERT_H */ +#include "ruby/3/static_assert.h" +#ifndef STATIC_ASSERT +# define STATIC_ASSERT RUBY3_STATIC_ASSERT +#endif -- cgit v1.2.3