[GNUnet-SVN] [gnurl] 135/208: errno: fix non-windows builds after af0216251b94e7

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.

commit a5834e525deb6d233990ae2288b156728db32cec
Author: Daniel Stenberg <address@hidden>
AuthorDate: Mon Jul 10 13:58:35 2017 +0200

    errno: fix non-windows builds after af0216251b94e7
---
 lib/memdebug.c |  2 +-
 lib/strerror.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/memdebug.c b/lib/memdebug.c
index 16434f819..8c9fe9502 100644
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -147,7 +147,7 @@ static bool countcheck(const char *func, int line, const 
char *source)
                 source, line, func);
         fflush(logfile); /* because it might crash now */
       }
-      SET_ERRNO(ENOMEM);
+      errno = ENOMEM;
       return TRUE; /* RETURN ERROR! */
     }
     else
diff --git a/lib/strerror.c b/lib/strerror.c
index 35dc0a421..a85c216a5 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2004 - 2016, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 2004 - 2017, Daniel Stenberg, <address@hidden>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -631,14 +631,16 @@ const char *Curl_strerror(struct connectdata *conn, int 
err)
   char *buf, *p;
   size_t max;
   int old_errno;
+#ifdef WIN32
   DWORD old_win_err;
-
+#endif
   DEBUGASSERT(conn);
   DEBUGASSERT(err >= 0);
 
   old_errno = errno;
+#ifdef WIN32
   old_win_err = GetLastError();
-
+#endif
   buf = conn->syserr_buf;
   max = sizeof(conn->syserr_buf)-1;
   *buf = '\0';
@@ -725,10 +727,10 @@ const char *Curl_strerror(struct connectdata *conn, int 
err)
   p = strrchr(buf, '\r');
   if(p && (p - buf) >= 1)
     *p = '\0';
-
+#ifdef WIN32
   if(old_win_err != GetLastError())
     SetLastError(old_win_err);
-
+#endif
   if(errno != old_errno)
     errno = old_errno;
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden