diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-06 14:27:24 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-06 14:27:24 -0700 |
| commit | e068e81f9f2c87c54a40020370b7c0105514dda2 (patch) | |
| tree | c38946df42b7d631c9c09078b2a4487261edec34 /indra/llmessage/llcurl.cpp | |
| parent | 02c1a6a515c5a18eece01aafb8de7a88b8c8c83f (diff) | |
| parent | 8a1fabd5a604244bca2910cdb54fb9df22b1bba7 (diff) | |
merge
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
| -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 } //////////////////////////////////////////////////////////////////////////// |