diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
| commit | 353d2059fc33174010127863a25983b918115361 (patch) | |
| tree | f2e08370b140352957b4d7757e59e0fe673f5a14 /indra/llmessage | |
| parent | 7610c0c050a84ebdf08b8e206eb7fe5e190dedb2 (diff) | |
| parent | d86eb3dd42d39e6b7647b6680100aeafe2173d36 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index a485fa0160..9b3b24c312 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -674,15 +674,7 @@ void LLCurl::Multi::removeEasy(Easy* easy) //static std::string LLCurl::strerror(CURLcode errorcode) { -#if LL_DARWIN - // curl_easy_strerror was added in libcurl 7.12.0. Unfortunately, the version in the Mac OS X 10.3.9 SDK is 7.10.2... - // There's a problem with the custom curl headers in our build that keeps me from #ifdefing this on the libcurl version number - // (the correct check would be #if LIBCURL_VERSION_NUM >= 0x070c00). We'll fix the header problem soon, but for now - // just punt and print the numeric error code on the Mac. - return llformat("%d", errorcode); -#else // LL_DARWIN return std::string(curl_easy_strerror(errorcode)); -#endif // LL_DARWIN } //////////////////////////////////////////////////////////////////////////// |