Skip to content

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

Closed
vszakats wants to merge 6 commits into
curl:masterfrom
vszakats:w-dupe-lean
Closed

windows: drop dupe macros, detect CURL_OS for WinCE ARM, indentation#16029
vszakats wants to merge 6 commits into
curl:masterfrom
vszakats:w-dupe-lean

Conversation

@vszakats
Copy link
Copy Markdown
Member

@vszakats vszakats commented Jan 17, 2025

  • 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.


w/o whitespace: https://github.com/curl/curl/pull/16029/files?w=1

@vszakats vszakats added Windows Windows-specific tidy-up labels Jan 17, 2025
@github-actions github-actions Bot added the tests label Jan 17, 2025
@vszakats vszakats changed the title setup-win32: drop duplicate defines (set earlier in curl_setup.h) tidy-up: Windows macros Jan 17, 2025
@vszakats vszakats changed the title tidy-up: Windows macros tidy-up: drop dupe macros, improve CURL_OS for ARM, indentation Jan 17, 2025
@vszakats vszakats changed the title tidy-up: drop dupe macros, improve CURL_OS for ARM, indentation windows: drop dupe macros, improve CURL_OS for ARM, indentation Jan 17, 2025
@vszakats vszakats changed the title windows: drop dupe macros, improve CURL_OS for ARM, indentation windows: drop dupe macros, detect CURL_OS for WinCE ARM, indentation Jan 17, 2025
Comment thread lib/setup-win32.h Outdated
@testclutch
Copy link
Copy Markdown

Analysis of PR #16029 at b34077f3:

Test 780 failed, which has NOT been flaky recently, so there could be a real issue in this PR.

Generated by Testclutch

@vszakats vszakats closed this in 2e2c6b0 Jan 17, 2025
@vszakats vszakats deleted the w-dupe-lean branch January 17, 2025 12:01
pps83 pushed a commit to pps83/curl that referenced this pull request Apr 26, 2025
- 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 curl#16029
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

3 participants