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

Improve OSX bit rot #6695

Merged
merged 7 commits into from Apr 10, 2018
Merged

Improve OSX bit rot #6695

merged 7 commits into from Apr 10, 2018

Conversation

@michicc
Copy link
Member

@michicc michicc commented Apr 8, 2018

OSX APIs are an ever-moving target. Update some uses in OTTD to hopefully improve compatibility with newer OSX versions.

@andythenorth
Copy link
Contributor

@andythenorth andythenorth commented Apr 8, 2018

Compiles and runs for me on macOS 10.12.6. I'm not competent to review the changes. I could try and trigger specific issues that the commits address if that helps.


/* Get a file system reference for the font. */
FSRef ref;
/* Get font reference from name. */

This comment has been minimized.

@frosch123

frosch123 Apr 9, 2018
Member

indentation

CFStringRef name = CFStringCreateWithCString(kCFAllocatorDefault, font_name, kCFStringEncodingUTF8);

#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
if (MacOSVersionIsAtLeast(10, 6, 0)) {

This comment has been minimized.

@frosch123

frosch123 Apr 9, 2018
Member

indent

CFRelease(fontURL);
}
if (descs != NULL) CFRelease(descs);
} else

This comment has been minimized.

@frosch123

frosch123 Apr 9, 2018
Member

indent

@michicc michicc force-pushed the michicc:osx_api_refresh branch from 697ef11 to 1372a00 Apr 10, 2018
@michicc
Copy link
Member Author

@michicc michicc commented Apr 10, 2018

Now with less spaces :)

@michicc michicc force-pushed the michicc:osx_api_refresh branch from 1372a00 to d184b72 Apr 10, 2018
@michicc
Copy link
Member Author

@michicc michicc commented Apr 10, 2018

Exterminate all the spaces!

Copy link
Member

@TrueBrain TrueBrain left a comment

Like any of us has a clue; sounds good to me! :D

Tnx for taking care of Mac OS X :)

@michicc michicc merged commit 6c3902a into OpenTTD:master Apr 10, 2018
1 check passed
1 check passed
continuous-integration/jenkins/pr-head This commit looks good
Details
@michicc michicc deleted the michicc:osx_api_refresh branch Apr 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants