diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-12-05 15:11:01 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-12-05 15:11:01 +0900 |
| commit | 3fdc3e5ee96dca5b11d1694975a65200787eab86 (patch) | |
| tree | 5c1733853892b8397d67706fa453a9bd978d2102 /boost/log/detail/config.hpp | |
| parent | 88e602c57797660ebe0f9e15dbd64c1ff16dead3 (diff) | |
| download | boost-3fdc3e5ee96dca5b11d1694975a65200787eab86.tar.gz boost-3fdc3e5ee96dca5b11d1694975a65200787eab86.tar.bz2 boost-3fdc3e5ee96dca5b11d1694975a65200787eab86.zip | |
Imported Upstream version 1.66.0upstream/1.66.0
Diffstat (limited to 'boost/log/detail/config.hpp')
| -rw-r--r-- | boost/log/detail/config.hpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/boost/log/detail/config.hpp b/boost/log/detail/config.hpp index c0bd84744f..5f43443e42 100644 --- a/boost/log/detail/config.hpp +++ b/boost/log/detail/config.hpp @@ -27,7 +27,7 @@ // Try including WinAPI config as soon as possible so that any other headers don't include Windows SDK headers #if defined(BOOST_OS_WINDOWS_AVAILABLE) -#include <boost/detail/winapi/config.hpp> +#include <boost/winapi/config.hpp> #endif #include <limits.h> // To bring in libc macros @@ -204,18 +204,14 @@ # define BOOST_LOG_NORETURN #endif -// GCC and compatible compilers may require marking types that may alias other types -#if defined(__GNUC__) -# define BOOST_LOG_MAY_ALIAS __attribute__ ((__may_alias__)) -#else -# define BOOST_LOG_MAY_ALIAS -#endif +// Some compilers may require marking types that may alias other types +#define BOOST_LOG_MAY_ALIAS BOOST_MAY_ALIAS #if !defined(BOOST_LOG_BUILDING_THE_LIB) // Detect if we're dealing with dll # if defined(BOOST_LOG_DYN_LINK) || defined(BOOST_ALL_DYN_LINK) -# define BOOST_LOG_DLL +# define BOOST_LOG_DLL # endif # if defined(BOOST_LOG_DLL) |