From 6cef0658be9d41660e8cd12f0b2ac44d4fea32a1 Mon Sep 17 00:00:00 2001
From: Andrey Semashev <andrey.semashev@gmail.com>
Date: Mon, 17 Jun 2013 21:20:22 +0000
Subject: [PATCH] Merged changes from trunk. Fixes #8703.

[SVN r84818]
---
 src/threadsafe_queue.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/threadsafe_queue.cpp b/src/threadsafe_queue.cpp
index 1bbd5dd..a63baff 100644
--- a/src/threadsafe_queue.cpp
+++ b/src/threadsafe_queue.cpp
@@ -53,8 +53,11 @@
 #define BOOST_LOG_HAS_POSIX_MEMALIGN 1
 #endif
 #elif (defined(_POSIX_VERSION) && (_POSIX_VERSION >= 200112L)) || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600))
+// Solaris 10 does not have posix_memalign. Solaris 11 and later seem to have it.
+#if !(defined(sun) || defined(__sun)) || defined(__SunOS_5_11) || defined(__SunOS_5_12)
 #define BOOST_LOG_HAS_POSIX_MEMALIGN 1
 #endif
+#endif
 
 #if defined(BOOST_WINDOWS)
 #include <malloc.h> // _aligned_malloc, _aligned_free