mirror of
https://github.com/curl/curl.git
synced 2026-05-30 08:17:30 +03:00
parent
4deea9396b
commit
c9edc26afe
2 changed files with 1 additions and 11 deletions
|
|
@ -38,14 +38,13 @@
|
|||
|
||||
/* adjust for old MSVC */
|
||||
#if defined(_MSC_VER) && (_MSC_VER < 1900)
|
||||
# define SNPRINTF _snprintf
|
||||
#define SNPRINTF _snprintf
|
||||
#else
|
||||
#define SNPRINTF snprintf
|
||||
#endif
|
||||
|
||||
#endif /* !BUILDING_LIBCURL */
|
||||
|
||||
#ifdef _WIN32
|
||||
/* This is a helper function for Curl_strerror that converts Windows API error
|
||||
* codes (GetLastError) to error messages.
|
||||
* Returns NULL if no error message was found for error code.
|
||||
|
|
@ -86,13 +85,10 @@ const char *curlx_get_winapi_error(int err, char *buf, size_t buflen)
|
|||
|
||||
return *buf ? buf : NULL;
|
||||
}
|
||||
#endif /* _WIN32 */
|
||||
|
||||
const char *curlx_winapi_strerror(DWORD err, char *buf, size_t buflen)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
DWORD old_win_err = GetLastError();
|
||||
#endif
|
||||
int old_errno = errno;
|
||||
|
||||
if(!buflen)
|
||||
|
|
@ -125,10 +121,8 @@ const char *curlx_winapi_strerror(DWORD err, char *buf, size_t buflen)
|
|||
if(errno != old_errno)
|
||||
CURL_SETERRNO(old_errno);
|
||||
|
||||
#ifdef _WIN32
|
||||
if(old_win_err != GetLastError())
|
||||
SetLastError(old_win_err);
|
||||
#endif
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,10 +34,6 @@
|
|||
|
||||
#include <curl/curl.h>
|
||||
|
||||
#ifdef USE_LIBIDN2
|
||||
#include <idn2.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_WINDOWS_SSPI
|
||||
#include "curl_sspi.h"
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue