Mercurial > hg > octave-lyh
changeset 9905:84a7c11ff928
Correctly compile even when libcurl is not present according to configure
Missing ifdefs surrounding code dependent on libcurl prevented compilation
when the library was not present.
| author | Rik <rdrider0-list@yahoo.com> |
|---|---|
| date | Wed, 02 Dec 2009 21:42:11 -0800 |
| parents | f0f19b51b5d0 |
| children | 8d20fb66a0dc |
| files | src/ChangeLog src/DLD-FUNCTIONS/urlwrite.cc |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-12-02 Rik <rik@nomad.inbox5.com> + + * DLD-FUNCTIONS/urlwrite.cc: Correctly compile code even when libcurl is + not present according to configure. + 2009-12-01 Jaroslav Hajek <highegg@gmail.com> * ov-bool-mat.h (octave_bool_matrix::octave_bool_matrix (const
--- a/src/DLD-FUNCTIONS/urlwrite.cc +++ b/src/DLD-FUNCTIONS/urlwrite.cc @@ -48,7 +48,7 @@ #include "oct-map.h" #include "unwind-prot.h" -#if defined (HAVE_CURL) +#ifdef HAVE_CURL #include <curl/curl.h> #include <curl/curlver.h> @@ -740,7 +740,7 @@ { octave_value_list retval; -#if defined (HAVE_CURL) +#ifdef HAVE_CURL int nargin = args.length (); @@ -900,7 +900,7 @@ // Octave's return value octave_value_list retval; -#if defined (HAVE_CURL) +#ifdef HAVE_CURL int nargin = args.length (); @@ -1423,6 +1423,7 @@ return octave_value (); } +#ifdef HAVE_CURL static string_vector mput_directory (const curl_handle& curl, const std::string& base, const std::string& dir) @@ -1509,6 +1510,7 @@ return retval; } +#endif DEFUN_DLD (__ftp_mput__, args, nargout, "-*- texinfo -*-\n\