diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-17 14:24:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-17 14:24:49 (GMT) |
| commit | 89b483f2b6f136509168ea4764072bae119ef618 (patch) | |
| tree | a38a6c01c23a2701f50687447190328ee1a402d5 /Utilities/cmcurl/lib/progress.c | |
| parent | da3b62cffd5a33a23d963beecc92305055c1bfee (diff) | |
| parent | 4071a7470723f98eac1e5f412f1d1bc27c882a36 (diff) | |
| download | CMake-89b483f2b6f136509168ea4764072bae119ef618.zip CMake-89b483f2b6f136509168ea4764072bae119ef618.tar.gz CMake-89b483f2b6f136509168ea4764072bae119ef618.tar.bz2 | |
Merge topic 'update-curl'
4071a747 curl: Update README-CMake.txt for new snapshot
7727d485 curl: Update configuration of build within CMake
3f2f1a94 curl: Fix check for gethostbyname_r with 5 arguments
91e8d35a Merge branch 'curl-upstream' into update-curl
602cdc06 cmCurl: Tolerate lack of CURLOPT_CAPATH support
70654261 curl 7.44.0 (reduced)
Diffstat (limited to 'Utilities/cmcurl/lib/progress.c')
| -rw-r--r-- | Utilities/cmcurl/lib/progress.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Utilities/cmcurl/lib/progress.c b/Utilities/cmcurl/lib/progress.c index f147ce7..b46e274 100644 --- a/Utilities/cmcurl/lib/progress.c +++ b/Utilities/cmcurl/lib/progress.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, 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 @@ -25,9 +25,7 @@ #include "urldata.h" #include "sendf.h" #include "progress.h" - -#define _MPRINTF_REPLACE /* use our functions only */ -#include <curl/mprintf.h> +#include "curl_printf.h" /* Provide a string that is 2 + 1 + 2 + 1 + 2 = 8 letters long (plus the zero byte) */ |