diff options
| author | Brad King <brad.king@kitware.com> | 2023-10-12 19:29:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-10-12 19:29:20 (GMT) |
| commit | df4efb72e4225dc3fd4f32313bc8b19122a98f66 (patch) | |
| tree | dbbb93a136f4f44184cbab061b03489379ef717c /Utilities/cmcurl/lib/curl_setup.h | |
| parent | 8f6a6b02e59c112dbe971adca4f25938903828ea (diff) | |
| parent | e6a6c1abc1e6b6e3ca9fa77947279509b55e2b01 (diff) | |
| download | CMake-df4efb72e4225dc3fd4f32313bc8b19122a98f66.zip CMake-df4efb72e4225dc3fd4f32313bc8b19122a98f66.tar.gz CMake-df4efb72e4225dc3fd4f32313bc8b19122a98f66.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2023-10-11 (d755a5f7)
Issue: #25329
Diffstat (limited to 'Utilities/cmcurl/lib/curl_setup.h')
| -rw-r--r-- | Utilities/cmcurl/lib/curl_setup.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h index 9d5fe99..8557cf4 100644 --- a/Utilities/cmcurl/lib/curl_setup.h +++ b/Utilities/cmcurl/lib/curl_setup.h @@ -28,11 +28,6 @@ #define CURL_NO_OLDIES #endif -/* define mingw version macros, eg __MINGW{32,64}_{MINOR,MAJOR}_VERSION */ -#ifdef __MINGW32__ -#include <_mingw.h> -#endif - /* * Disable Visual Studio warnings: * 4127 "conditional expression is constant" @@ -845,9 +840,6 @@ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf, #endif #if defined(USE_UNIX_SOCKETS) && defined(WIN32) -# if defined(__MINGW32__) && !defined(LUP_SECURE) - typedef u_short ADDRESS_FAMILY; /* Classic mingw, 11y+ old mingw-w64 */ -# endif # if !defined(UNIX_PATH_MAX) /* Replicating logic present in afunix.h (distributed with newer Windows 10 SDK versions only) */ |