examples: make them compile with compatibility functions disabled (Windows)

For MinGW this is `-DNO_OLDNAMES`, with MSVC it is
`-D_CRT_DECLARE_NONSTDC_NAMES=0`.

There have been some support for this before this patch.
After this patch this is extended to all examples.

(And also the standalone http/client programs, if here.)

Cherry-picked from #15652
Closes #15789

diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c
index 3bbc056c0b453592c1a7120b450826c0c807b544..6dfb5c53d5a5217e0140adba666ea8249f937d47 100644 (file)
--- a/docs/examples/anyauthput.c
+++ b/docs/examples/anyauthput.c
@@ -34,9 +34,11 @@
 #include <curl/curl.h>
 
 #ifdef _WIN32
-#  define FILENO(fp) _fileno(fp)
-#else
-#  define FILENO(fp) fileno(fp)
+#undef stat
+#define stat _stat
+#undef fstat
+#define fstat _fstat
+#define fileno _fileno
 #endif
 
 #if LIBCURL_VERSION_NUM < 0x070c03
@@ -98,7 +100,7 @@ int main(int argc, char **argv)
 
   /* get the file size of the local file */
   fp = fopen(file, "rb");
-  fstat(FILENO(fp), &file_info);
+  fstat(fileno(fp), &file_info);
 
   /* In Windows, this inits the Winsock stuff */
   curl_global_init(CURL_GLOBAL_ALL);

diff --git a/docs/examples/fileupload.c b/docs/examples/fileupload.c
index 9e3bd84f72638e22906d20857482754adfef87f9..f1e7253ef8b66383335fc7c71877f57d84678d1b 100644 (file)
--- a/docs/examples/fileupload.c
+++ b/docs/examples/fileupload.c
@@ -30,6 +30,14 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#ifdef _WIN32
+#undef stat
+#define stat _stat
+#undef fstat
+#define fstat _fstat
+#define fileno _fileno
+#endif
+
 int main(void)
 {
   CURL *curl;

diff --git a/docs/examples/ftpupload.c b/docs/examples/ftpupload.c
index 462202e6cf93d7a3cef36c07f4154e85e198cb3b..593c33d343ac7fe53e3ceee745722e17af4fc444 100644 (file)
--- a/docs/examples/ftpupload.c
+++ b/docs/examples/ftpupload.c
@@ -31,6 +31,8 @@
 #include <errno.h>
 #ifdef _WIN32
 #include <io.h>
+#undef stat
+#define stat _stat
 #else
 #include <unistd.h>
 #endif

diff --git a/docs/examples/http2-upload.c b/docs/examples/http2-upload.c
index e804fb76a97f97f2ee622e52f7429ce749e14824..292897c1b9b4f9824bd31da513c778fffdf85463 100644 (file)
--- a/docs/examples/http2-upload.c
+++ b/docs/examples/http2-upload.c
@@ -38,6 +38,11 @@
 #include <unistd.h>
 #endif
 
+#ifdef _WIN32
+#undef stat
+#define stat _stat
+#endif
+
 /* curl stuff */
 #include <curl/curl.h>
 #include <curl/mprintf.h>

diff --git a/docs/examples/httpput.c b/docs/examples/httpput.c
index ebd2b7696c3325c39d71942c34bfded0fe37e178..f7cffc8114541d49efc380e6f6c16602f4748296 100644 (file)
--- a/docs/examples/httpput.c
+++ b/docs/examples/httpput.c
@@ -30,6 +30,11 @@
 #include <sys/stat.h>
 #include <curl/curl.h>
 
+#ifdef _WIN32
+#undef stat
+#define stat _stat
+#endif
+
 /*
  * This example shows an HTTP PUT operation. PUTs a file given as a command
  * line argument to the URL also given on the command line.

diff --git a/tests/http/clients/hx-download.c b/tests/http/clients/hx-download.c
index 94e9d0cbd6d43b3e00c321e2521f047f2b17a54a..80da0c66a848a7ac85a1d244d849b9aad682438d 100644 (file)
--- a/tests/http/clients/hx-download.c
+++ b/tests/http/clients/hx-download.c
@@ -37,6 +37,10 @@
 #include <unistd.h>  /* getopt() */
 #endif
 
+#ifdef _WIN32
+#define strdup _strdup
+#endif
+
 #ifndef CURLPIPE_MULTIPLEX
 #error "too old libcurl, cannot do HTTP/2 server push!"
 #endif