[Gnash-commit] gnash ChangeLog libbase/curl_adapter.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/28 09:36:46

Modified files:
        .              : ChangeLog 
        libbase        : curl_adapter.cpp 

Log message:
                * libbase/curl_adapter.cpp: drop support for curl pre-7.12
                  (was released in 2004).
        
                This was well before Gnash's required boost version (1.33) was 
released,
                (2005-08) so is extremely unlikely to be the stumbling block 
for builds.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6736&r2=1.6737
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6736
retrieving revision 1.6737
diff -u -b -r1.6736 -r1.6737
--- ChangeLog   28 May 2008 09:21:32 -0000      1.6736
+++ ChangeLog   28 May 2008 09:36:45 -0000      1.6737
@@ -1,5 +1,10 @@
 2008-05-28 Benjamin Wolsey <address@hidden>
 
+       * libbase/curl_adapter.cpp: drop support for curl pre-7.12
+         (was released in 2004).
+
+2008-05-28 Benjamin Wolsey <address@hidden>
+
        * libbase/curl_adapter.cpp: use select() to wait for data instead
          of sleeping. Correct includes, logging and cstdio.
 

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- libbase/curl_adapter.cpp    28 May 2008 09:21:33 -0000      1.51
+++ libbase/curl_adapter.cpp    28 May 2008 09:36:46 -0000      1.52
@@ -69,40 +69,6 @@
 // define this if you want seeks back to be reported
 //#define GNASH_CURL_WARN_SEEKSBACK 1
 
-// Adapt to older versions of libcurl.
-//
-// In 7.10.7 and before, CURLINFO_RESPONSE_CODE was called CURLINFO_HTTP_CODE
-//
-#if LIBCURL_VERSION_NUM <= 0x070a07
-# define CURLINFO_RESPONSE_CODE CURLINFO_HTTP_CODE
-#endif
-//
-// curl_multi_strerror() and curl_easy_strerror() came in at 7.12.0
-// Just print the number and tell the user how to decode it.
-//
-#if LIBCURL_VERSION_NUM < 0x070c00
-static const char *
-curl_easy_strerror(int code)
-{
-    static std::string ret;
-       std::ostringstream ss << "CurlE error code " <<
-                          code << " (man libcurl-errors)";
-       
-       ret = ss.str();
-       return ret.c_str();
-}
-
-static const char *
-curl_multi_strerror(int code)
-{
-    static std::string ret;
-       std::ostringstream ss << "CurlM error code " <<
-                          code << " (man libcurl-errors)";
-
-       ret = ss.str();
-       return ret.c_str();
-}
-#endif
 
 namespace curl_adapter
 {