diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/OS400/ccsidcurl.c | 10 | ||||
-rw-r--r-- | packages/OS400/make-lib.sh | 14 | ||||
-rw-r--r-- | packages/OS400/os400sys.c | 4 | ||||
-rw-r--r-- | packages/Symbian/group/curl.mmp | 3 | ||||
-rw-r--r-- | packages/Symbian/group/libcurl.mmp | 125 |
5 files changed, 33 insertions, 123 deletions
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index 4ef9acbf6..1baff3951 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -32,10 +32,10 @@ #pragma enum(int) #include "curl.h" -#include "curl_mprintf.h" -#include "curl_urldata.h" -#include "curl_url.h" -#include "curl_getinfo.h" +#include "mprintf.h" +#include "urldata.h" +#include "url.h" +#include "getinfo.h" #include "ccsidcurl.h" #include "os400sys.h" diff --git a/packages/OS400/make-lib.sh b/packages/OS400/make-lib.sh index d9c6e9e95..a9e1c3861 100644 --- a/packages/OS400/make-lib.sh +++ b/packages/OS400/make-lib.sh @@ -13,7 +13,7 @@ cd "${TOPDIR}/lib" echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c echo '#pragma comment(user, __DATE__)' >> os400.c echo '#pragma comment(user, __TIME__)' >> os400.c -echo '#pragma comment(copyright, "Copyright (C) 1998-2013 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c +echo '#pragma comment(copyright, "Copyright (C) 1998-2012 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c make_module OS400 os400.c LINK= # No need to rebuild service program yet. MODULES= @@ -151,13 +151,13 @@ fi if [ "${TEST_FORMDATA}" ] then MODULES= - make_module TFORMDATA curl_formdata.c "'_FORM_DEBUG' 'CURLDEBUG'" - make_module TSTREQUAL curl_strequal.c "'_FORM_DEBUG' 'CURLDEBUG'" - make_module TMEMDEBUG curl_memdebug.c "'_FORM_DEBUG' 'CURLDEBUG'" - make_module TMPRINTF curl_mprintf.c "'_FORM_DEBUG' 'CURLDEBUG'" - make_module TSTRERROR curl_strerror.c "'_FORM_DEBUG' 'CURLDEBUG'" + make_module TFORMDATA formdata.c "'_FORM_DEBUG' 'CURLDEBUG'" + make_module TSTREQUAL strequal.c "'_FORM_DEBUG' 'CURLDEBUG'" + make_module TMEMDEBUG memdebug.c "'_FORM_DEBUG' 'CURLDEBUG'" + make_module TMPRINTF mprintf.c "'_FORM_DEBUG' 'CURLDEBUG'" + make_module TSTRERROR strerror.c "'_FORM_DEBUG' 'CURLDEBUG'" # The following modules should not be needed (see comment in - # curl_formdata.c. However, there are some unsatisfied + # formdata.c. However, there are some unsatisfied # external references leading in the following # modules to be (recursively) needed. MODULES="${MODULES} EASY STRDUP SSLGEN QSSL HOSTIP HOSTIP4 HOSTIP6" diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c index 61ae1e0f3..5527ce720 100644 --- a/packages/OS400/os400sys.c +++ b/packages/OS400/os400sys.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -24,7 +24,7 @@ /* OS/400 additional support. */ #include "curlbuild.h" -#include "config-os400.h" /* Not curl_setup.h: we only need some defines. */ +#include "config-os400.h" /* Not setup.h: we only need some defines. */ #include <sys/types.h> #include <sys/socket.h> diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp index caddfeca4..28498ce7b 100644 --- a/packages/Symbian/group/curl.mmp +++ b/packages/Symbian/group/curl.mmp @@ -49,8 +49,7 @@ SOURCE \ SOURCEPATH ../../../lib SOURCE \ - curl_nonblock.c \ - curl_rawstr.c + rawstr.c nonblock.c USERINCLUDE ../../../src ../../../lib ../../../include/curl diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index eb920c08f..933994faa 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -21,113 +21,24 @@ MACRO USE_SSLEAY SOURCEPATH ../../../lib SOURCE \ - curl_addrinfo.c \ - curl_amigaos.c \ - curl_asyn_ares.c \ - curl_asyn_thread.c \ - curl_axtls.c \ - curl_base64.c \ - curl_bundles.c \ - curl_conncache.c \ - curl_connect.c \ - curl_content_encoding.c \ - curl_cookie.c \ - curl_cyassl.c \ - curl_darwinssl.c \ - curl_dict.c \ - curl_easy.c \ - curl_escape.c \ - curl_file.c \ - curl_fileinfo.c \ - curl_fnmatch.c \ - curl_formdata.c \ - curl_ftp.c \ - curl_ftplistparser.c \ - curl_getenv.c \ - curl_gethostname.c \ - curl_getinfo.c \ - curl_gopher.c \ - curl_gssapi.c \ - curl_gtls.c \ - curl_hash.c \ - curl_hmac.c \ - curl_hostasyn.c \ - curl_hostip.c \ - curl_hostip4.c \ - curl_hostip6.c \ - curl_hostsyn.c \ - curl_http.c \ - curl_http_chunks.c \ - curl_http_digest.c \ - curl_http_negotiate.c \ - curl_http_negotiate_sspi.c \ - curl_http_proxy.c \ - curl_idn_win32.c \ - curl_if2ip.c \ - curl_imap.c \ - curl_inet_ntop.c \ - curl_inet_pton.c \ - curl_krb4.c \ - curl_krb5.c \ - curl_ldap.c \ - curl_llist.c \ - curl_md4.c \ - curl_md5.c \ - curl_memdebug.c \ - curl_memrchr.c \ - curl_mprintf.c \ - curl_multi.c \ - curl_multibyte.c \ - curl_netrc.c \ - curl_non_ascii.c \ - curl_nonblock.c \ - curl_nss.c \ - curl_ntlm.c \ - curl_ntlm_core.c \ - curl_ntlm_msgs.c \ - curl_ntlm_wb.c \ - curl_openldap.c \ - curl_parsedate.c \ - curl_pingpong.c \ - curl_polarssl.c \ - curl_pop3.c \ - curl_progress.c \ - curl_qssl.c \ - curl_rand.c \ - curl_rawstr.c \ - curl_rtmp.c \ - curl_rtsp.c \ - curl_sasl.c \ - curl_schannel.c \ - curl_security.c \ - curl_select.c \ - curl_sendf.c \ - curl_share.c \ - curl_slist.c \ - curl_smtp.c \ - curl_socks.c \ - curl_socks_gssapi.c \ - curl_socks_sspi.c \ - curl_speedcheck.c \ - curl_splay.c \ - curl_ssh.c \ - curl_sslgen.c \ - curl_ssluse.c \ - curl_sspi.c \ - curl_strdup.c \ - curl_strequal.c \ - curl_strerror.c \ - curl_strtok.c \ - curl_strtoofft.c \ - curl_telnet.c \ - curl_tftp.c \ - curl_threads.c \ - curl_timeval.c \ - curl_transfer.c \ - curl_url.c \ - curl_version.c \ - curl_warnless.c \ - curl_wildcard.c + file.c timeval.c base64.c hostip.c progress.c formdata.c \ + cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \ + ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \ + netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \ + curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \ + memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \ + content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \ + http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \ + hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \ + select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \ + qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \ + curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \ + pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \ + curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \ + idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \ + asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \ + curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c \ + curl_multibyte.c curl_darwinssl.c bundles.c conncache.c USERINCLUDE ../../../lib ../../../include/curl #ifdef ENABLE_SSL |