diff options
author | Brad King <brad.king@kitware.com> | 2018-10-22 16:55:14 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-10-22 16:55:14 (GMT) |
commit | ec13ba36b5398f1d561d6e72d8e253d0eb3c2b5e (patch) | |
tree | beb2cf13c007254d5daefa4bd929ce70520e890c /Utilities/cmcurl/lib/http2.h | |
parent | 8b5cd17000a6fcf3cf9637c4a5048a7a91fc68e3 (diff) | |
parent | 031002456381245f88f64b0826798b1e249e8e39 (diff) | |
download | CMake-ec13ba36b5398f1d561d6e72d8e253d0eb3c2b5e.zip CMake-ec13ba36b5398f1d561d6e72d8e253d0eb3c2b5e.tar.gz CMake-ec13ba36b5398f1d561d6e72d8e253d0eb3c2b5e.tar.bz2 |
Merge branch 'update-curl' into release-3.13
Merge-request: !2509
Diffstat (limited to 'Utilities/cmcurl/lib/http2.h')
-rw-r--r-- | Utilities/cmcurl/lib/http2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/cmcurl/lib/http2.h b/Utilities/cmcurl/lib/http2.h index f597c80..21cd9b8 100644 --- a/Utilities/cmcurl/lib/http2.h +++ b/Utilities/cmcurl/lib/http2.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, 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 @@ -65,7 +65,7 @@ void Curl_http2_cleanup_dependencies(struct Curl_easy *data); #define Curl_http2_request_upgrade(x,y) CURLE_UNSUPPORTED_PROTOCOL #define Curl_http2_setup(x) CURLE_UNSUPPORTED_PROTOCOL #define Curl_http2_switched(x,y,z) CURLE_UNSUPPORTED_PROTOCOL -#define Curl_http2_setup_conn(x) +#define Curl_http2_setup_conn(x) Curl_nop_stmt #define Curl_http2_setup_req(x) #define Curl_http2_init_state(x) #define Curl_http2_init_userset(x) |