diff options
| author | Werner Koch <[email protected]> | 2012-03-30 13:29:35 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-03-30 13:29:35 +0000 |
| commit | 1731ed88491559aca395bc0596cdc0ee3ea1fa3e (patch) | |
| tree | f8fcc1b09960edfa0a3c1aaf992aea8c63a425c4 | |
| parent | Fix --with-pth-prefix help string. (diff) | |
| download | gnupg-1731ed88491559aca395bc0596cdc0ee3ea1fa3e.tar.gz gnupg-1731ed88491559aca395bc0596cdc0ee3ea1fa3e.zip | |
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.
| -rw-r--r-- | common/estream.c | 2 |
1 files changed, 1 insertions, 1 deletions
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))) |