From 1731ed88491559aca395bc0596cdc0ee3ea1fa3e Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 30 Mar 2012 15:29:35 +0200 Subject: Cast second value of a ?: to void in estream.c. * common/estream.c (ESTREAM_MUTEX_LOCK): Cast pth_mutex_acquire result to void. Some compilers choke on mixing void and int in an conditional operator. Reported by Nelson H. F. Beebe. --- common/estream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/estream.c b/common/estream.c index 2d6841572..3b6139eb2 100644 --- a/common/estream.c +++ b/common/estream.c @@ -176,7 +176,7 @@ static int estream_pth_killed; # define ESTREAM_MUTEX_INITIALIZER PTH_MUTEX_INIT # define ESTREAM_MUTEX_LOCK(mutex) \ (estream_pth_killed ? dummy_mutex_call_void ((mutex)) \ - : pth_mutex_acquire (&(mutex), 0, NULL)) + : (void)pth_mutex_acquire (&(mutex), 0, NULL)) # define ESTREAM_MUTEX_UNLOCK(mutex) \ (estream_pth_killed ? dummy_mutex_call_void ((mutex)) \ : pth_mutex_release (&(mutex))) -- cgit v1.2.3