summaryrefslogtreecommitdiff
path: root/boost/log
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 15:18:43 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2019-12-05 15:18:43 +0900
commit5ce2ccf2f23c6d3de4c79f216f57ca6f2a18ed16 (patch)
treebbee48efb9867d19ac3fdd84ba714c7af326cd53 /boost/log
parentb8cf34c691623e4ec329053cbbf68522a855882d (diff)
downloadboost-5ce2ccf2f23c6d3de4c79f216f57ca6f2a18ed16.tar.gz
boost-5ce2ccf2f23c6d3de4c79f216f57ca6f2a18ed16.tar.bz2
boost-5ce2ccf2f23c6d3de4c79f216f57ca6f2a18ed16.zip
Imported Upstream version 1.68.0upstream/1.68.0
Diffstat (limited to 'boost/log')
-rw-r--r--boost/log/detail/config.hpp19
-rw-r--r--boost/log/detail/timestamp.hpp2
2 files changed, 20 insertions, 1 deletions
diff --git a/boost/log/detail/config.hpp b/boost/log/detail/config.hpp
index 8db321baad..cb2f6d365b 100644
--- a/boost/log/detail/config.hpp
+++ b/boost/log/detail/config.hpp
@@ -116,6 +116,19 @@
# define BOOST_LOG_NO_ASIO
#endif
+#if defined(__VXWORKS__)
+# define BOOST_LOG_NO_GETPGRP
+# define BOOST_LOG_NO_GETSID
+ // for _WRS_CONFIG_USER_MANAGEMENT used below
+# include <vsbConfig.h>
+#endif
+
+#if (!defined(__CRYSTAX__) && defined(__ANDROID__) && (__ANDROID_API__+0) < 21) \
+ || (defined(__VXWORKS__) && !defined(_WRS_CONFIG_USER_MANAGEMENT))
+// Until Android API version 21 Google NDK does not provide getpwuid_r
+# define BOOST_LOG_NO_GETPWUID_R
+#endif
+
#if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO)
# ifndef BOOST_LOG_WITHOUT_SYSLOG
# define BOOST_LOG_WITHOUT_SYSLOG
@@ -297,8 +310,14 @@
#ifndef BOOST_LOG_CPU_CACHE_LINE_SIZE
//! The macro defines the CPU cache line size for the target architecture. This is mostly used for optimization.
+#if defined(__s390__) || defined(__s390x__)
+#define BOOST_LOG_CPU_CACHE_LINE_SIZE 256
+#elif defined(powerpc) || defined(__powerpc__) || defined(__ppc__)
+#define BOOST_LOG_CPU_CACHE_LINE_SIZE 128
+#else
#define BOOST_LOG_CPU_CACHE_LINE_SIZE 64
#endif
+#endif
namespace boost {
diff --git a/boost/log/detail/timestamp.hpp b/boost/log/detail/timestamp.hpp
index 9bd006136d..7c8bd84532 100644
--- a/boost/log/detail/timestamp.hpp
+++ b/boost/log/detail/timestamp.hpp
@@ -76,7 +76,7 @@ public:
*/
#if defined(BOOST_WINDOWS) && !defined(__CYGWIN__)
-typedef uint64_t (WINAPI* get_tick_count_t)();
+typedef uint64_t (BOOST_WINAPI_WINAPI_CC* get_tick_count_t)();
extern BOOST_LOG_API get_tick_count_t get_tick_count;
inline timestamp get_timestamp()