| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 950b27f8320b841490cafcb3e6e3b818c7174c0d Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Thu, 20 Jul 2017 22:32:50 -0400 |
| 4 | Subject: [PATCH] fix compile failure against musl C library |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 9 | --- |
| 10 | test/cpp/server_abyss.cpp | 2 +- |
| 11 | tools/xmlrpc_pstream/xmlrpc_pstream.cpp | 10 +++++++--- |
| 12 | 2 files changed, 8 insertions(+), 4 deletions(-) |
| 13 | |
| 14 | diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp |
| 15 | index 2458a8f..82f91da 100644 |
| 16 | --- a/test/cpp/server_abyss.cpp |
| 17 | +++ b/test/cpp/server_abyss.cpp |
| 18 | @@ -18,7 +18,7 @@ |
| 19 | #ifdef WIN32 |
| 20 | #include <winsock2.h> |
| 21 | #else |
| 22 | - #include <sys/unistd.h> |
| 23 | + #include <unistd.h> |
| 24 | #include <sys/socket.h> |
| 25 | #include <arpa/inet.h> |
| 26 | #include <netinet/in.h> |
| 27 | diff --git a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp |
| 28 | index d39e105..1fd8900 100644 |
| 29 | --- a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp |
| 30 | +++ b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp |
| 31 | @@ -15,11 +15,15 @@ |
| 32 | #include "xmlrpc-c/girerr.hpp" |
| 33 | using girerr::throwf; |
| 34 | |
| 35 | -#include <features.h> // for __BEGIN_DECLS |
| 36 | +#ifdef __cplusplus |
| 37 | +extern "C" { |
| 38 | +#endif |
| 39 | |
| 40 | -__BEGIN_DECLS |
| 41 | #include "dumpvalue.h" /* An internal Xmlrpc-c header file ! */ |
| 42 | -__END_DECLS |
| 43 | + |
| 44 | +#ifdef __cplusplus |
| 45 | +} |
| 46 | +#endif |
| 47 | |
| 48 | |
| 49 | #include <xmlrpc-c/base.hpp> |
| 50 | -- |
| 51 | 2.8.1 |
| 52 | |