[Gnash-commit] gnash ChangeLog server/asobj/NetConnection.cpp ...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/25 16:21:22

Modified files:
        .              : ChangeLog 
        server/asobj   : NetConnection.cpp NetConnection.h 

Log message:
                * server/asobj/NetConnection.{cpp,h}:
                  Allow build w/out libcurl.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2457&r2=1.2458
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.h?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2457
retrieving revision 1.2458
diff -u -b -r1.2457 -r1.2458
--- ChangeLog   25 Feb 2007 15:45:32 -0000      1.2457
+++ ChangeLog   25 Feb 2007 16:21:21 -0000      1.2458
@@ -1,5 +1,7 @@
 2007-02-25 Sandro Santilli <address@hidden>
 
+       * server/asobj/NetConnection.{cpp,h}:
+         Allow build w/out libcurl.
        * extensions/fileio/Makefile.am: fix
          'make check' and 'make dist' rules.
        * server/asobj/LoadVars.cpp: implemented

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/NetConnection.cpp      14 Feb 2007 20:41:48 -0000      1.22
+++ server/asobj/NetConnection.cpp      25 Feb 2007 16:21:21 -0000      1.23
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetConnection.cpp,v 1.22 2007/02/14 20:41:48 tgc Exp $ */
+/* $Id: NetConnection.cpp,v 1.23 2007/02/25 16:21:21 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -44,7 +44,7 @@
 static void netconnection_connect(const fn_call& fn);
 static as_object* getNetConnectionInterface();
 
-#ifdef HAVE_CURL_CURL_H
+#ifdef USE_CURL
 
 /// \class NetConnection
 /// \brief Opens a local connection through which you can play

Index: server/asobj/NetConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/NetConnection.h        14 Feb 2007 20:41:48 -0000      1.16
+++ server/asobj/NetConnection.h        25 Feb 2007 16:21:21 -0000      1.17
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetConnection.h,v 1.16 2007/02/14 20:41:48 tgc Exp $ */
+/* $Id: NetConnection.h,v 1.17 2007/02/25 16:21:21 strk Exp $ */
 
 #ifndef __NETCONNECTION_H__
 #define __NETCONNECTION_H__
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_CURL_CURL_H
+#ifdef USE_CURL
 #include <curl/curl.h>
 #include <stdexcept>
 #include <cstdio>
@@ -85,11 +85,13 @@
        // TODO: don't really do this :)
        std::string _url;
 
+#ifdef USE_CURL
        // the libcurl easy handle
        CURL *_handle;
 
        // the libcurl multi handle
        CURLM *_mhandle;
+#endif
 
        // transfer in progress
        int _running;