Avoid warning.

wilx · wilx · commit 4529e6876314 · 2017-01-30T21:35:53.000+01:00
Rearrange loop around `sem_wait()` to avoid "embedding a directive within macro
arguments is not portable" warning.
diff --git a/include/log4cplus/thread/impl/syncprims-pthreads.h b/include/log4cplus/thread/impl/syncprims-pthreads.h
@@ -246,13 +246,12 @@ void
 Semaphore::lock () const
 {
     int ret;
-    while (LOG4CPLUS_UNLIKELY ((
+    while (
 #if defined (LOG4CPLUS_USE_NAMED_POSIX_SEMAPHORE)
-            ret = sem_wait (sem)
+        LOG4CPLUS_UNLIKELY ((ret = sem_wait (sem)) == -1)
 #else
-            ret = sem_wait (&sem)
+        LOG4CPLUS_UNLIKELY ((ret = sem_wait (&sem)) == -1)
 #endif
-                ) == -1)
         && errno == EINTR)
     { /* try again after signal */ }
 
