diff options
author | 卜部昌平 <[email protected]> | 2020-04-10 14:11:40 +0900 |
---|---|---|
committer | 卜部昌平 <[email protected]> | 2020-04-13 16:06:00 +0900 |
commit | 4ff3f205408ff8bb413d69151105d301858136ba (patch) | |
tree | 0494fea3f4cdb82ec1d34e462438389dfea8b8da /include/ruby/3/compiler_is/msvc.h | |
parent | a3f6f67967644f34226b4424227d2eec52fedd45 (diff) |
add #include guard hack
According to MSVC manual (*1), cl.exe can skip including a header file
when that:
- contains #pragma once, or
- starts with #ifndef, or
- starts with #if ! defined.
GCC has a similar trick (*2), but it acts more stricter (e. g. there
must be _no tokens_ outside of #ifndef...#endif).
Sun C lacked #pragma once for a looong time. Oracle Developer Studio
12.5 finally implemented it, but we cannot assume such recent version.
This changeset modifies header files so that each of them include
strictly one #ifndef...#endif. I believe this is the most portable way
to trigger compiler optimizations. [Bug #16770]
*1: https://docs.microsoft.com/en-us/cpp/preprocessor/once
*2: https://gcc.gnu.org/onlinedocs/cppinternals/Guard-Macros.html
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3023
Diffstat (limited to 'include/ruby/3/compiler_is/msvc.h')
-rw-r--r-- | include/ruby/3/compiler_is/msvc.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/ruby/3/compiler_is/msvc.h b/include/ruby/3/compiler_is/msvc.h index beb8076046..e2c72a1175 100644 --- a/include/ruby/3/compiler_is/msvc.h +++ b/include/ruby/3/compiler_is/msvc.h @@ -1,4 +1,6 @@ -/** \noop-*-C++-*-vi:ft=cpp +#ifndef RUBY3_COMPILER_IS_MSVC_H /*-*-C++-*-vi:se ft=cpp:*/ +#define RUBY3_COMPILER_IS_MSVC_H +/** * @file * @author Ruby developers <[email protected]> * @copyright This file is a part of the programming language Ruby. @@ -21,10 +23,7 @@ #include "ruby/3/compiler_is/clang.h" #include "ruby/3/compiler_is/intel.h" -#if defined(RUBY3_COMPILER_IS_MSVC) -# /* Take that. */ - -#elif ! defined(_MSC_VER) +#if ! defined(_MSC_VER) # define RUBY3_COMPILER_IS_MSVC 0 #elif RUBY3_COMPILER_IS(Clang) @@ -54,3 +53,5 @@ # define RUBY3_COMPILER_VERSION_MINOR (_MSC_VER % 100) # define RUBY3_COMPILER_VERSION_PATCH 0 #endif + +#endif /* RUBY3_COMPILER_IS_MSVC_H */ |