generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-17 11:05:05 +02:00
Code Issues Projects Releases Wiki Activity

Fix name conflicts

Browse Source 
Previously `struct iovec` was explicitly defined on non-Unix systems,
which caused name conflicts when other libraries (e.g. Cyrus SASL) did the same.
Using `struct iovec` as `msgpack::iovec` solves the problem.
This commit is contained in:
Daniil Kovalev
2021-05-08 16:26:25 +03:00
parent 6b6a05e07c
commit 3944993686
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/msgpack/v1/vrefbuffer.hpp
View File

@@ -26,11 +26,16 @@
#if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__) #if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__)
#include <sys/uio.h> #include <sys/uio.h>
namespace msgpack {
typedef ::iovec iovec;
} // namespace msgpack
#else #else
namespace msgpack {
struct iovec { struct iovec {
void *iov_base; void *iov_base;
size_t iov_len; size_t iov_len;
}; };
} // namespace msgpack
#endif #endif
namespace msgpack { namespace msgpack {
@@ -183,7 +188,7 @@ public:
} }
} }
const struct iovec* vector() const const iovec* vector() const
{ {
return m_array; return m_array;
} }