luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windows: drop dupe macros, detect CURL_OS for WinCE ARM, indentation

Browse Source 
- 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:
Viktor Szakats 2025-01-16 15:31:54 +01:00
parent 587ce6586c
commit 2e2c6b0b4e
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
5 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config-win32ce.h
View File

@ -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 */

11
lib/setup-win32.h
View File

@ -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>