Revert "Imported Upstream version 7.44.0"

[platform/upstream/curl.git] / packages / OS400 / curl.inc.in

diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 1221015..fcbf7c7 100644 (file)
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -5,7 +5,7 @@
       *                            | (__| |_| |  _ <| |___
       *                             \___|\___/|_| \_\_____|
       *
-      * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+      * Copyright (C) 1998 - 2014, 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
@@ -222,8 +222,6 @@
      d                 c                   2
      d CURL_HTTP_VERSION_2_0...
      d                 c                   3
-     d CURL_HTTP_VERSION_2...
-     d                 c                   3
       *
      d CURL_NETRC_IGNORED...
      d                 c                   0
@@ -278,9 +276,6 @@
      d CURL_CSELECT_ERR...
      d                 c                   X'00000004'
       *
-     d CURL_PUSH_OK    c                   0
-     d CURL_PUSH_DENY  c                   1
-      *
      d CURLPAUSE_RECV  c                   X'00000001'
      d CURLPAUSE_RECV_CONT...
      d                 c                   X'00000000'
@@ -522,8 +517,6 @@
      d                 c                   89
      d  CURLE_SSL_PINNEDPUBKEYNOTMATCH...
      d                 c                   90
-     d  CURLE_SSL_INVALIDCERTSTATUS...
-     d                 c                   91
       *
       /if not defined(CURL_NO_OLDIES)
      d  CURLE_URL_MALFORMAT_USER...
@@ -681,9 +674,7 @@
      d                 c                   3
       *
      d CURLSSLOPT_ALLOW_BEAST...
-     d                 c                   X'0001'
-     d CURLSSLOPT_NO_REVOKE...
-     d                 c                   X'0002'
+     d                 c                   1
       *
       /if not defined(CURL_NO_OLDIES)
      d curl_ftpssl     s                   like(curl_usessl)
@@ -1212,18 +1203,6 @@
      d                 c                   10230
      d  CURLOPT_UNIX_SOCKET_PATH...
      d                 c                   10231
-     d  CURLOPT_SSL_VERIFYSTATUS...
-     d                 c                   00232
-     d  CURLOPT_SSL_FALSESTART...
-     d                 c                   00233
-     d  CURLOPT_PATH_AS_IS...
-     d                 c                   00234
-     d  CURLOPT_PROXY_SERVICE_NAME...
-     d                 c                   10235
-     d  CURLOPT_SERVICE_NAME...
-     d                 c                   10236
-     d  CURLOPT_PIPEWAIT...
-     d                 c                   00237
       *
       /if not defined(CURL_NO_OLDIES)
      d  CURLOPT_FILE   c                   10001
@@ -1582,18 +1561,6 @@
      d                 c                   10012
      d  CURLMOPT_MAX_TOTAL_CONNECTIONS...
      d                 c                   00013
-     d  CURLMOPT_PUSHFUNCTION...
-     d                 c                   20014
-     d  CURLMOPT_PUSHDATA...
-     d                 c                   10015
-      *
-      * Bitmask bits for CURLMOPT_PIPELING.
-      *
-     d CURLPIPE_NOTHING...
-     d                 c                   x'00000000'
-     d CURLPIPE_HTTP1  c                   x'00000001'
-     d CURLPIPE_MULTIPLEX...
-     d                 c                   x'00000002'
       *
       *  Public API enums for RTSP requests.
       *
@@ -1812,12 +1779,6 @@
      d curl_socket_callback...
      d                 s               *   based(######ptr######) procptr
       *
-     d curl_multi_timer_callback...
-     d                 s               *   based(######ptr######) procptr
-      *
-     d curl_push_callback...
-     d                 s               *   based(######ptr######) procptr
-      *
      d curl_opensocket_callback...
      d                 s               *   based(######ptr######) procptr
       *
@@ -2133,16 +2094,6 @@
      d                 pr              *   extproc('curl_multi_strerror')       char *
      d  code                               value like(CURLMcode)
       *
-     d curl_pushheader_bynum...
-     d                 pr              *   extproc('curl_pushheader_bynum')     char *
-     d  h                              *   value                                curl_pushheaders *
-     d  num                          10u 0 value
-      *
-     d curl_pushheader_byname...
-     d                 pr              *   extproc('curl_pushheader_byname')    char *
-     d  h                              *   value                                curl_pushheaders *
-     d  header                         *   value options(*string)               const char *
-      *
      d curl_multi_socket...
      d                 pr                  extproc('curl_multi_socket')
      d                                     like(CURLMcode)
@@ -2310,19 +2261,4 @@
      d  objectarg                      *   value options(*string: *nopass)
      d  ccsid                        10u 0 value options(*nopass)
       *
-     d curl_pushheader_bynum_ccsid...
-     d                 pr              *   extproc(                             char *
-     d                                       'curl_pushheader_bynum_ccsid')
-     d  h                              *   value                                curl_pushheaders *
-     d  num                          10u 0 value
-     d  ccsid                        10u 0 value
-      *
-     d curl_pushheader_byname_ccsid...
-     d                 pr              *   extproc(                             char *
-     d                                       'curl_pushheader_byname_ccsid')
-     d  h                              *   value                                curl_pushheaders *
-     d  header                         *   value options(*string)               const char *
-     d  ccsidin                      10u 0 value
-     d  ccsidout                     10u 0 value
-      *
       /endif