summaryrefslogtreecommitdiff
path: root/lib/strerror.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-07-10 13:58:35 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-07-10 13:59:05 +0200
commita5834e525deb6d233990ae2288b156728db32cec (patch)
tree604d642ba2cb7e9eac3308186f00b138d3791a22 /lib/strerror.c
parent793e831bbff597212c72ded33c375891c8394f6d (diff)
downloadcurl-a5834e525deb6d233990ae2288b156728db32cec.tar.gz
errno: fix non-windows builds after af0216251b94e7
Diffstat (limited to 'lib/strerror.c')
-rw-r--r--lib/strerror.c12
1 files changed, 7 insertions, 5 deletions
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, <daniel@haxx.se>, et al.
+ * Copyright (C) 2004 - 2017, Daniel Stenberg, <daniel@haxx.se>, 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;