Skip to content

squash! Port header fixes from MSys2 #35

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

Merged
merged 1 commit into from
Mar 9, 2015

Conversation

dscho
Copy link
Member

@dscho dscho commented Mar 9, 2015

Replace the commit message with this one:

Assorted header fixes to support MSys2-based MinGW build

The excellent MSys2 project brings a substantially updated MinGW
environment including newer GCC versions and new headers. To support
compiling Git, let's special-case the new MinGW (tell-tale: the
_MINGW_MAJOR_MINOR constant is defined).

Signed-off-by: Johannes Schindelin [email protected]

@dscho
Copy link
Member Author

dscho commented Mar 9, 2015

A lot of annoying compile warnings (for fork() being redeclared, and for the wrong PRIuMAX in format strings such as test-chmtime.c's) are addressed by this change.

@sschuberth @t-b please have a look and feel free to merge when you think it is ready!

@sschuberth
Copy link

the _MINGW_MAJOR_MINOR constant is defined

Shouldn't that say _MINGW64_VERSION_MAJOR?

@dscho
Copy link
Member Author

dscho commented Mar 9, 2015

the _MINGW_MAJOR_MINOR constant is defined

Shouldn't that say _MINGW64_VERSION_MAJOR?

Good point. Fixed.

@sschuberth
Copy link

Good point. Fixed.

Not really fixed yet ;-) Now it says _MINGW64_MAJOR_MINOR, but it should still say _MINGW64_VERSION_MAJOR (at least that's what the code says).

Replace the commit message with this one:

Assorted header fixes to support MSys2-based MinGW build

The excellent MSys2 project brings a substantially updated MinGW
environment including newer GCC versions and new headers. To support
compiling Git, let's special-case the new MinGW (tell-tale: the
_MINGW64_VERSION_MAJOR constant is defined).

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
Copy link
Member Author

dscho commented Mar 9, 2015

Bah. Now it is fixed. Thank you for being thorough.

sschuberth added a commit that referenced this pull request Mar 9, 2015
squash! Port header fixes from MSys2
@sschuberth sschuberth merged commit f452084 into git-for-windows:master Mar 9, 2015
@dscho dscho deleted the fix-warnings branch March 9, 2015 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants