diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-09 11:26:24 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-09 11:26:24 -0700 |
| commit | 2661a4c2c9359f2c2cabce6f48704dc8fb481994 (patch) | |
| tree | d6fafbb1a084ea8b06db3d3499bd5084b7e4f7f6 /indra/llmessage | |
| parent | 26334a4c57e58bfd13e6bbbff2298ec5ba3e77e7 (diff) | |
| parent | a5118ccd6721afdf4f8c71cba6007eb7be4d7c19 (diff) | |
Merge.
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 } //////////////////////////////////////////////////////////////////////////// |