diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Android/Android.mk | 3 | ||||
| -rw-r--r-- | packages/OS400/make-include.sh | 9 | ||||
| -rw-r--r-- | packages/OS400/os400sys.c | 4 | ||||
| -rw-r--r-- | packages/vms/clean_gnv_curl.com | 6 | ||||
| -rw-r--r-- | packages/vms/pcsi_gnv_curl_file_list.txt | 3 | ||||
| -rw-r--r-- | packages/vms/stage_curl_install.com | 8 |
6 files changed, 6 insertions, 27 deletions
diff --git a/packages/Android/Android.mk b/packages/Android/Android.mk index 301ab9e7c..72f5e231f 100644 --- a/packages/Android/Android.mk +++ b/packages/Android/Android.mk @@ -59,9 +59,8 @@ common_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline -Wnested-exte include $(CLEAR_VARS) include $(LOCAL_PATH)/lib/Makefile.inc CURL_HEADERS := \ - curlbuild.h \ curl.h \ - curlrules.h \ + system.h \ curlver.h \ easy.h \ mprintf.h \ diff --git a/packages/OS400/make-include.sh b/packages/OS400/make-include.sh index ad72cf4a7..3c50d2d5f 100644 --- a/packages/OS400/make-include.sh +++ b/packages/OS400/make-include.sh @@ -8,15 +8,6 @@ SCRIPTDIR=`dirname "${0}"` cd "${TOPDIR}/include" -# Produce the curlbuild.h header file if not yet in distribution (CVS). - -if action_needed curl/curlbuild.h -then if action_needed curl/curlbuild.h curl/curlbuild.h.dist - then cp -p curl/curlbuild.h.dist curl/curlbuild.h - fi -fi - - # Create the OS/400 source program file for the header files. SRCPF="${LIBIFSNAME}/H.FILE" diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c index 89837bdc1..8ae635e43 100644 --- a/packages/OS400/os400sys.c +++ b/packages/OS400/os400sys.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, 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 @@ -23,7 +23,7 @@ /* OS/400 additional support. */ -#include "curlbuild.h" +#include <curl/curl.h> #include "config-os400.h" /* Not curl_setup.h: we only need some defines. */ #include <sys/types.h> diff --git a/packages/vms/clean_gnv_curl.com b/packages/vms/clean_gnv_curl.com index ba0173fe0..67b9d9db6 100644 --- a/packages/vms/clean_gnv_curl.com +++ b/packages/vms/clean_gnv_curl.com @@ -105,9 +105,6 @@ $! $ file = "lcl_root:[...]*.lai" $ if f$search(file) .nes. "" then delete 'file';* $! -$ file = "lcl_root:[.include.curl]curlbuild.h_old" -$ if f$search(file) .nes. "" then delete 'file';* -$! $ file = "lcl_root:[.packages.vms]curl-*_original_src.bck" $ if f$search(file) .nes. "" then delete 'file';* $! @@ -166,9 +163,6 @@ $! $ file = "lcl_root:[]config.h" $ if f$search(file) .nes. "" then delete 'file';* $! -$ file = "lcl_root:[.include.curl]curlbuild.h" -$ if f$search(file) .nes. "" then delete 'file';* -$! $ file = "lcl_root:[.src]config.h" $ if f$search(file) .nes. "" then delete 'file';* $! diff --git a/packages/vms/pcsi_gnv_curl_file_list.txt b/packages/vms/pcsi_gnv_curl_file_list.txt index ab5b633dc..07539b2cd 100644 --- a/packages/vms/pcsi_gnv_curl_file_list.txt +++ b/packages/vms/pcsi_gnv_curl_file_list.txt @@ -58,8 +58,7 @@ [gnv.usr.bin]curl-config. [gnv.usr.bin]gnv$curl.exe [gnv.usr.include.curl]curl.h -[gnv.usr.include.curl]curlbuild.h -[gnv.usr.include.curl]curlrules.h +[gnv.usr.include.curl]system.h [gnv.usr.include.curl]curlver.h [gnv.usr.include.curl]easy.h [gnv.usr.include.curl]mprintf.h diff --git a/packages/vms/stage_curl_install.com b/packages/vms/stage_curl_install.com index 0dccdd6af..84540d739 100644 --- a/packages/vms/stage_curl_install.com +++ b/packages/vms/stage_curl_install.com @@ -11,8 +11,6 @@ $! [usr.bin]curl-config. $! [usr.lib]gnv$libcurl.exe $! [usr.bin]curl. hard link for [usr.bin]gnv$curl.exe $! [usr.include.curl]curl.h -$! [usr.include.curl]curlbuild.h -$! [usr.include.curl]curlrules.h $! [usr.include.curl]curlver.h $! [usr.include.curl]easy.h $! [usr.include.curl]mprintf.h @@ -132,10 +130,8 @@ $! $ if remove_files .eq. 0 $ then $ copy [--.include.curl]curl.h 'new_gnu'[usr.include.curl]curl.h -$ copy [--.include.curl]curlbuild.h - - 'new_gnu'[usr.include.curl]curlbuild.h -$ copy [--.include.curl]curlrules.h - - 'new_gnu'[usr.include.curl]curlrules.h +$ copy [--.include.curl]system.h - + 'new_gnu'[usr.include.curl]system.h $ copy [--.include.curl]curlver.h - 'new_gnu'[usr.include.curl]curlver.h $ copy [--.include.curl]easy.h - |