romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 06:53:32 +03:00
Code Issues Projects Releases Packages 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
Download patch file Download diff file Expand all files Collapse all files

11
lib/setup-win32.h
View file

@ -77,17 +77,6 @@
# if defined(_UNICODE) && !defined(UNICODE)
# error "_UNICODE is defined but UNICODE is not defined"
# 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 <ws2tcpip.h>
# include <windows.h>