From 49a991346e9c6f334d014f16944744a1dac11c64 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 31 Oct 2015 22:48:21 +0100 Subject: curl.h: s/HTTPPOST_/CURL_HTTPOST_ Fixes a name space pollution at the cost of programs using one of these defines will no longer compile. However, the vast majority of libcurl programs that do multipart formposts use curl_formadd() to build this list. Closes #506 --- src/tool_setopt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tool_setopt.c') diff --git a/src/tool_setopt.c b/src/tool_setopt.c index 2ed68e5eb..e11f527ac 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2015, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -392,11 +392,11 @@ CURLcode tool_setopt_httppost(CURL *curl, struct GlobalConfig *config, ret = CURLE_OUT_OF_MEMORY; goto nomem; } - if(pp->flags & HTTPPOST_FILENAME) { + if(pp->flags & CURL_HTTPPOST_FILENAME) { /* file upload as for -F @filename */ DATA1(" CURLFORM_FILE, \"%s\",", escaped); } - else if(pp->flags & HTTPPOST_READFILE) { + else if(pp->flags & CURL_HTTPPOST_READFILE) { /* content from file as for -F