diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-08 20:30:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-29 20:43:21 (GMT) |
| commit | 80c881f7938969dab169f4fc4fbf8bc3d4355fc2 (patch) | |
| tree | 77abe643bf8fcb388056480350b99b666f543965 /Utilities/cmcurl/lib/content_encoding.h | |
| parent | ff67d2b57946a29e18d1947efe71f26ece9e1747 (diff) | |
| parent | 3fe5d9bff98b4716e219516c30d71462495324f4 (diff) | |
| download | CMake-80c881f7938969dab169f4fc4fbf8bc3d4355fc2.zip CMake-80c881f7938969dab169f4fc4fbf8bc3d4355fc2.tar.gz CMake-80c881f7938969dab169f4fc4fbf8bc3d4355fc2.tar.bz2 | |
Merge branch 'curl-upstream' into update-curl
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
Diffstat (limited to 'Utilities/cmcurl/lib/content_encoding.h')
| -rw-r--r-- | Utilities/cmcurl/lib/content_encoding.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Utilities/cmcurl/lib/content_encoding.h b/Utilities/cmcurl/lib/content_encoding.h index b31669b..501f6c8 100644 --- a/Utilities/cmcurl/lib/content_encoding.h +++ b/Utilities/cmcurl/lib/content_encoding.h @@ -1,3 +1,5 @@ +#ifndef HEADER_CURL_CONTENT_ENCODING_H +#define HEADER_CURL_CONTENT_ENCODING_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -5,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2006, 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 @@ -18,24 +20,29 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * $Id$ ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" /* * Comma-separated list all supported Content-Encodings ('identity' is implied) */ #ifdef HAVE_LIBZ #define ALL_CONTENT_ENCODINGS "deflate, gzip" +/* force a cleanup */ +void Curl_unencode_cleanup(struct connectdata *conn); #else #define ALL_CONTENT_ENCODINGS "identity" +#define Curl_unencode_cleanup(x) Curl_nop_stmt #endif CURLcode Curl_unencode_deflate_write(struct connectdata *conn, - struct Curl_transfer_keeper *k, + struct SingleRequest *req, ssize_t nread); CURLcode Curl_unencode_gzip_write(struct connectdata *conn, - struct Curl_transfer_keeper *k, + struct SingleRequest *k, ssize_t nread); + + +#endif /* HEADER_CURL_CONTENT_ENCODING_H */ |