From 3587e8481da0bfcf4ed15fd6f3aaaf04e54b1eab Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon>
Date: Wed, 15 Apr 2009 14:33:05 +0000
Subject: [PATCH] bug #26121: set_errno can be overridden

---
 CHANGELOG         | 3 +++
 src/api/sockets.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 07b18d97..99feaad8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,9 @@ HISTORY
 
   ++ New features:
 
+  2009-04-15 Simon Goldschmidt
+  * sockets.c: bug #26121: set_errno can be overridden
+
   2009-03-31 Kieran Mansley
   * tcp.c, tcp_out.c, tcp_in.c, sys.h, tcp.h, opts.h: add support for
     TCP timestamp options, off by default.  Rework tcp_enqueue() to
diff --git a/src/api/sockets.c b/src/api/sockets.c
index 4137a046..b7a99eed 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -150,7 +150,9 @@ static const int err_to_errno_table[] = {
     err_to_errno_table[-(err)] : EIO)
 
 #ifdef ERRNO
+#ifndef set_errno
 #define set_errno(err) errno = (err)
+#endif
 #else
 #define set_errno(err)
 #endif