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

Partially revert "somewhat protect Mac OS X users from using Mac OS 9 config file" #10037

Closed
wants to merge 1 commit into from

Conversation

ryandesign
Copy link
Contributor

This reverts part of commit 62519bf.

Do things that are specific to classic Mac OS (i.e. include config-mac.h in curl_setup.h and rename main to curl_main in tool_setup.h) when only macintosh is defined. Remove the additional condition that __MRC__ should be defined since that would only be true with the MPW MrC compiler which prevents the use of other reasonable compilers like the MPW SC compiler and especially the Metrowerks CodeWarrior compilers. macintosh is only defined by classic Mac OS compilers so this change should not affect users of Mac OS X / OS X / macOS / any other OS.


The first line of the commit message is markedly longer than 50 characters. I wasn't sure if there was a recommended way to truncate it when reverting a commit like this, or if I should use a more descriptive first line that doesn't mention the reversion.

… config file"

This reverts part of commit 62519bf.

Do things that are specific to classic Mac OS (i.e. include config-mac.h
in curl_setup.h and rename "main" to "curl_main" in tool_setup.h) when
only "macintosh" is defined. Remove the additional condition that
"__MRC__" should be defined since that would only be true with the MPW
MrC compiler which prevents the use of other reasonable compilers like
the MPW SC compiler and especially the Metrowerks CodeWarrior compilers.
"macintosh" is only defined by classic Mac OS compilers so this change
should not affect users of Mac OS X / OS X / macOS / any other OS.
@ryandesign
Copy link
Contributor Author

Please feel free to edit my commit messages as needed.

bagder
bagder approved these changes Dec 6, 2022
Copy link
Member

@bagder bagder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is an ancient commit being reverted, I think the commit message better just explain the change without caring about it being a revert.

I'll edit that as I merge!

@bagder bagder closed this in 82b3481 Dec 6, 2022
@bagder
Copy link
Member

bagder commented Dec 6, 2022

Thanks!

@ryandesign ryandesign deleted the ryandesign-macintosh branch December 6, 2022 10:16
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.

None yet

2 participants