diff options
| author | Colin Cross <ccross@android.com> | 2022-01-14 17:46:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-14 17:46:07 +0000 |
| commit | 99f2246ae5fc8b4ebae089fe7eb2f436b4b3d2c8 (patch) | |
| tree | 8b44416dc505796eb333c969c57c54bd6fa91b96 | |
| parent | 09b99ecb8be89baab78bea3ab43c89c009f6d2cb (diff) | |
| parent | cdbb0b56b82851fde814d0835af966062c77439a (diff) | |
| download | parameter-framework-99f2246ae5fc8b4ebae089fe7eb2f436b4b3d2c8.tar.gz | |
Fix building parameter-framework against musl am: 8f04302f2b am: 290ad7f861 am: cdbb0b56b8
Original change: https://android-review.googlesource.com/c/platform/external/parameter-framework/+/1949439
Change-Id: I5ca05b54599e40a7a849ff3eec7c225583bda600
| -rw-r--r-- | asio-1.10.6/include/asio/detail/socket_types.hpp | 2 | ||||
| -rw-r--r-- | asio-1.10.6/include/asio/impl/error_code.ipp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asio-1.10.6/include/asio/detail/socket_types.hpp b/asio-1.10.6/include/asio/detail/socket_types.hpp index 379f035..80ae520 100644 --- a/asio-1.10.6/include/asio/detail/socket_types.hpp +++ b/asio-1.10.6/include/asio/detail/socket_types.hpp @@ -15,7 +15,7 @@ #include "asio/detail/config.hpp" # include <sys/ioctl.h> -# include <sys/poll.h> +# include <poll.h> # include <sys/types.h> # include <sys/stat.h> # include <fcntl.h> diff --git a/asio-1.10.6/include/asio/impl/error_code.ipp b/asio-1.10.6/include/asio/impl/error_code.ipp index 4704245..02875bd 100644 --- a/asio-1.10.6/include/asio/impl/error_code.ipp +++ b/asio-1.10.6/include/asio/impl/error_code.ipp @@ -42,7 +42,7 @@ public: #if defined(__sun) || defined(__QNX__) || defined(__SYMBIAN32__) using namespace std; return strerror(value); -#elif defined(__MACH__) && defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(_AIX) || defined(__hpux) || defined(__osf__) || defined(__ANDROID__) +#elif defined(__MACH__) && defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(_AIX) || defined(__hpux) || defined(__osf__) || defined(__ANDROID__) || defined(ANDROID_HOST_MUSL) char buf[256] = ""; using namespace std; strerror_r(value, buf, sizeof(buf)); |