From 4063f26b6502685fe7dfbd65ea517f3ee15d8bea Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 8 Oct 2014 16:45:39 -0400 Subject: [PATCH] curl: Port to Haiku again Re-apply change from commit v2.8.0~1683 (add initial support for HAIKU OS, 2008-09-15) on updated upstream curl. However, leave out the part that was reverted by commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated preprocessor checks, 2013-10-05). --- Utilities/cmcurl/CMakeLists.txt | 2 ++ Utilities/cmcurl/include/curl/curl.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 0cd4f3a78..ca5f34fde 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -215,6 +215,8 @@ if(BEOS) check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI) endif(BEOS) +check_library_exists_concat("network" recv HAVE_LIBNETWORK) + if(NOT NOT_NEED_LIBNSL) check_library_exists_concat("nsl" gethostbyname HAVE_LIBNSL) endif(NOT NOT_NEED_LIBNSL) diff --git a/Utilities/cmcurl/include/curl/curl.h b/Utilities/cmcurl/include/curl/curl.h index d40b2dbbf..1df2fe489 100644 --- a/Utilities/cmcurl/include/curl/curl.h +++ b/Utilities/cmcurl/include/curl/curl.h @@ -82,7 +82,7 @@ #include #endif -#ifdef __BEOS__ +#if defined __BEOS__ || defined __HAIKU__ #include #endif