sockpp: add version v0.8.3 and v1.0.0 (#3038)
* sockpp: add version v0.8.3 and v1.0.0 * sockpp: apply patch * sockpp: update patch * sockpp: update patch * sockpp: update patchpull/3043/head
parent
ae45c38b42
commit
632c1f4bfe
2 changed files with 11 additions and 49 deletions
@ -1,53 +1,13 @@ |
||||
diff --git a/src/exception.cpp b/src/exception.cpp
|
||||
index 7cb010d..e9f1da1 100644
|
||||
index 72aae7e..16d11ad 100644
|
||||
--- a/src/exception.cpp
|
||||
+++ b/src/exception.cpp
|
||||
@@ -57,30 +57,30 @@ sys_error::sys_error(int err) : runtime_error(error_str(err)), errno_(err)
|
||||
|
||||
std::string sys_error::error_str(int err)
|
||||
{
|
||||
- char buf[1024];
|
||||
- buf[0] = '\x0';
|
||||
+ char buf[1024];
|
||||
+ buf[0] = '\x0';
|
||||
|
||||
- #if defined(_WIN32)
|
||||
- FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||
- NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
||||
- buf, sizeof(buf), NULL);
|
||||
+ #if defined(_WIN32)
|
||||
+ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||
+ NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
||||
+ buf, sizeof(buf), NULL);
|
||||
@@ -66,7 +66,7 @@ string sys_error::error_str(int err)
|
||||
buf, sizeof(buf), NULL);
|
||||
#else
|
||||
- #ifdef _GNU_SOURCE
|
||||
#ifdef _GNU_SOURCE
|
||||
- #if !defined(__GLIBC__)
|
||||
- // use the XSI standard behavior.
|
||||
- int e = strerror_r(err, buf, sizeof(buf));
|
||||
- auto s = strerror(e);
|
||||
- return s ? std::string(s) : std::string();
|
||||
- #else
|
||||
- // assume GNU exception
|
||||
- auto s = strerror_r(err, buf, sizeof(buf));
|
||||
- return s ? std::string(s) : std::string();
|
||||
- #endif
|
||||
+ #ifdef _GNU_SOURCE
|
||||
+ #if defined(__GLIBC__) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 23)
|
||||
+ // assume GNU exception
|
||||
+ auto s = strerror_r(err, buf, sizeof(buf));
|
||||
+ return s ? std::string(s) : std::string();
|
||||
+ #else
|
||||
+ // use the XSI standard behavior.
|
||||
+ int e = strerror_r(err, buf, sizeof(buf));
|
||||
+ auto s = strerror(e);
|
||||
+ return s ? std::string(s) : std::string();
|
||||
+ #endif
|
||||
#else
|
||||
ignore_result(strerror_r(err, buf, sizeof(buf)));
|
||||
#endif
|
||||
#endif
|
||||
- return std::string(buf);
|
||||
+ return std::string(buf);
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
+ #if (!defined(__GLIBC__) && !defined(__ANDROID_API__)) || (defined(__ANDROID_API__) && __ANDROID_API__ < 23)
|
||||
// use the XSI standard behavior.
|
||||
int e = strerror_r(err, buf, sizeof(buf));
|
||||
auto s = strerror(e);
|
||||
|
Loading…
Reference in new issue