Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from ninja-build:master #39

Merged
merged 4 commits into from
May 28, 2024
Merged

Commits on May 20, 2024

  1. Configuration menu
    Copy the full SHA
    7744530 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. cmake: disable min() and max() macros in windows.h

    Using std::min() and/or std::max() in sources where windows.h has been
    include fails with
    
        error C2589: '(': illegal token on right side of '::' [D:\a\ninja\ninja\build\libninja.vcxproj]
        error C2062: type 'unknown-type' unexpected [D:\a\ninja\ninja\build\libninja.vcxproj]
        error C2059: syntax error: ')' [D:\a\ninja\ninja\build\libninja.vcxproj]
        error C2589: '(': illegal token on right side of '::' [D:\a\ninja\ninja\build\libninja.vcxproj]
        error C2059: syntax error: ')' [D:\a\ninja\ninja\build\libninja.vcxproj]
    
    Avoid this by defining NOMINMAX for windows builds, which causes the
    windows.h header to skip defining those two macros.
    hundeboll committed May 27, 2024
    Configuration menu
    Copy the full SHA
    b332497 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Merge pull request #2455 from hundeboll/nominmax

    cmake: disable min() and max() macros in windows.h
    jhasse authored May 28, 2024
    Configuration menu
    Copy the full SHA
    8aa51b2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2452 from mavit/emacs-metadata

    Add Emacs package attributes, “Keywords” and “URL”
    jhasse authored May 28, 2024
    Configuration menu
    Copy the full SHA
    0b4b43a View commit details
    Browse the repository at this point in the history