am 32c89b41: Merge change 2069 into donut

Merge commit '32c89b41d072a26efe06706871eecad7b1906c1a'

* commit '32c89b41d072a26efe06706871eecad7b1906c1a':
  Fix one minor crashing bug when -debug-audio is used with the OSS audio backend.

2 files changed, 5 insertions, 2 deletions

diff --git a/audio/esdaudio.c b/audio/esdaudio.c
index 05c030f..2226022 100644
--- a/audio/esdaudio.c
+++ b/audio/esdaudio.c
@@ -226,7 +226,7 @@ static int qesd_run_out (HWVoiceOut *hw)
     esd->live = live - decr;
     hw->rpos = esd->rpos;
     if (esd->live > 0) {
-        O("%s: signaling %d samples\n", esd->live);
+        O("%s: signaling %d samples\n", __FUNCTION__, esd->live);
         audio_pt_unlock_and_signal (&esd->pt, AUDIO_FUNC);
     }
     else {
diff --git a/sockets.c b/sockets.c
index 87ee567..2e61d9a 100644
--- a/sockets.c
+++ b/sockets.c
@@ -50,7 +50,10 @@
     do { _ret = (_cmd); } while ( _ret < 0 && WSAGetLastError() == WSAEINTR )
 #else
 #  define  QSOCKET_CALL(_ret,_cmd)   \
-    do { _ret = (_cmd); } while ( _ret < 0 && errno == EINTR )
+    do { \
+        errno = 0; \
+        do { _ret = (_cmd); } while ( _ret < 0 && errno == EINTR ); \
+    } while (0);
 #endif
 
 #ifdef _WIN32