From 863dbb21d8912c73e84fed47f2d3a1ac5d8275d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Mon, 2 Dec 2019 14:48:42 +0900 Subject: assume C99 Now that we no longer support old compilers, we can safely delete several obsolete #ifdef gurads. Also because (as of writing) it is impossible to compile the program using C++ compilers, lets just entirely prohibit __cplusplus to reduce # of LOCs. Note however that we still cannot eliminate __STDC_VERSION__ checks, because MSVC does not define it, saying its C99 support is partial. See also https://social.msdn.microsoft.com/Forums/vstudio/en-US/53a4fd75-9f97-48b2-aa63-2e2e5a15efa3 --- internal.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'internal.h') diff --git a/internal.h b/internal.h index 5b7f87ae8d..337aee814d 100644 --- a/internal.h +++ b/internal.h @@ -12,13 +12,10 @@ #ifndef RUBY_INTERNAL_H #define RUBY_INTERNAL_H 1 -#include "ruby.h" +#include "ruby/config.h" -#if defined(__cplusplus) -extern "C" { -#if 0 -} /* satisfy cc-mode */ -#endif +#ifdef __cplusplus +# error not for C++ #endif #include "ruby/encoding.h" @@ -87,10 +84,4 @@ extern "C" { #include "internal/inits.h" #include "internal/warnings.h" -#if defined(__cplusplus) -#if 0 -{ /* satisfy cc-mode */ -#endif -} /* extern "C" { */ -#endif #endif /* RUBY_INTERNAL_H */ -- cgit v1.2.3