windows: drop dupe macros, detect CURL_OS for WinCE ARM, indentation
- setup-win32: drop duplicate `WIN32_LEAN_AND_MEAN` and `NOGDI` macros (set earlier in `curl_setup.h`) - config-win32ce: detect ARM for `CURL_OS` macro. Based on: https://cegcc.sourceforge.net/docs/details.html It should also apply to MSVC. (untested) - indentation. Closes #16029
This commit is contained in:
parent
587ce6586c
commit
2e2c6b0b4e
@ -235,8 +235,12 @@
|
|||||||
|
|
||||||
/* Define cpu-machine-OS */
|
/* Define cpu-machine-OS */
|
||||||
#ifndef CURL_OS
|
#ifndef CURL_OS
|
||||||
|
#ifdef _M_ARM
|
||||||
|
#define CURL_OS "arm-pc-win32ce"
|
||||||
|
#else
|
||||||
#define CURL_OS "i386-pc-win32ce"
|
#define CURL_OS "i386-pc-win32ce"
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/* ---------------------------------------------------------------- */
|
/* ---------------------------------------------------------------- */
|
||||||
/* Windows CE */
|
/* Windows CE */
|
||||||
|
|||||||
@ -81,27 +81,27 @@ extern PSecurityFunctionTable Curl_pSecFn;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef SEC_I_SIGNATURE_NEEDED
|
#ifndef SEC_I_SIGNATURE_NEEDED
|
||||||
# define SEC_I_SIGNATURE_NEEDED ((HRESULT)0x0009035CL)
|
#define SEC_I_SIGNATURE_NEEDED ((HRESULT)0x0009035CL)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CRYPT_E_REVOKED
|
#ifndef CRYPT_E_REVOKED
|
||||||
# define CRYPT_E_REVOKED ((HRESULT)0x80092010L)
|
#define CRYPT_E_REVOKED ((HRESULT)0x80092010L)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CRYPT_E_NO_REVOCATION_DLL
|
#ifndef CRYPT_E_NO_REVOCATION_DLL
|
||||||
# define CRYPT_E_NO_REVOCATION_DLL ((HRESULT)0x80092011L)
|
#define CRYPT_E_NO_REVOCATION_DLL ((HRESULT)0x80092011L)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CRYPT_E_NO_REVOCATION_CHECK
|
#ifndef CRYPT_E_NO_REVOCATION_CHECK
|
||||||
# define CRYPT_E_NO_REVOCATION_CHECK ((HRESULT)0x80092012L)
|
#define CRYPT_E_NO_REVOCATION_CHECK ((HRESULT)0x80092012L)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CRYPT_E_REVOCATION_OFFLINE
|
#ifndef CRYPT_E_REVOCATION_OFFLINE
|
||||||
# define CRYPT_E_REVOCATION_OFFLINE ((HRESULT)0x80092013L)
|
#define CRYPT_E_REVOCATION_OFFLINE ((HRESULT)0x80092013L)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CRYPT_E_NOT_IN_REVOCATION_DATABASE
|
#ifndef CRYPT_E_NOT_IN_REVOCATION_DATABASE
|
||||||
# define CRYPT_E_NOT_IN_REVOCATION_DATABASE ((HRESULT)0x80092014L)
|
#define CRYPT_E_NOT_IN_REVOCATION_DATABASE ((HRESULT)0x80092014L)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef UNICODE
|
#ifdef UNICODE
|
||||||
|
|||||||
@ -77,17 +77,6 @@
|
|||||||
# if defined(_UNICODE) && !defined(UNICODE)
|
# if defined(_UNICODE) && !defined(UNICODE)
|
||||||
# error "_UNICODE is defined but UNICODE is not defined"
|
# error "_UNICODE is defined but UNICODE is not defined"
|
||||||
# endif
|
# endif
|
||||||
/*
|
|
||||||
* Do not include unneeded stuff in Windows headers to avoid compiler
|
|
||||||
* warnings and macro clashes.
|
|
||||||
* Make sure to define this macro before including any Windows headers.
|
|
||||||
*/
|
|
||||||
# ifndef WIN32_LEAN_AND_MEAN
|
|
||||||
# define WIN32_LEAN_AND_MEAN
|
|
||||||
# endif
|
|
||||||
# ifndef NOGDI
|
|
||||||
# define NOGDI
|
|
||||||
# endif
|
|
||||||
# include <winsock2.h>
|
# include <winsock2.h>
|
||||||
# include <ws2tcpip.h>
|
# include <ws2tcpip.h>
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
|
|||||||
@ -149,7 +149,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CALG_SHA_256
|
#ifndef CALG_SHA_256
|
||||||
# define CALG_SHA_256 0x0000800c
|
#define CALG_SHA_256 0x0000800c
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef PKCS12_NO_PERSIST_KEY
|
#ifndef PKCS12_NO_PERSIST_KEY
|
||||||
|
|||||||
@ -28,13 +28,13 @@
|
|||||||
|
|
||||||
/* For Windows, mainly (may be moved in a config file?) */
|
/* For Windows, mainly (may be moved in a config file?) */
|
||||||
#ifndef STDIN_FILENO
|
#ifndef STDIN_FILENO
|
||||||
#define STDIN_FILENO 0
|
#define STDIN_FILENO 0
|
||||||
#endif
|
#endif
|
||||||
#ifndef STDOUT_FILENO
|
#ifndef STDOUT_FILENO
|
||||||
#define STDOUT_FILENO 1
|
#define STDOUT_FILENO 1
|
||||||
#endif
|
#endif
|
||||||
#ifndef STDERR_FILENO
|
#ifndef STDERR_FILENO
|
||||||
#define STDERR_FILENO 2
|
#define STDERR_FILENO 2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
CURLcode test(char *URL)
|
CURLcode test(char *URL)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user