Skip to content

[FIX] Updated preprocessor directives for macOS #1661

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.

Sign up for GitHub

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
cfsmp3 merged 1 commit into from
Feb 23, 2025
Merged

[FIX] Updated preprocessor directives for macOS #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/thirdparty/freetype/gzip/ftzconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,14 @@
# define FAR
#endif

#if !defined(MACOS) && !defined(TARGET_OS_MAC)
#if !defined(__APPLE__) && !defined(__MACH__)
typedef unsigned char Byte; /* 8 bits */
#endif

#if defined(__APPLE__) && defined(__MACH__)
typedef char Byte; /* 8 bits(1 byte) */
#endif

typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */

Expand Down
2 changes: 1 addition & 1 deletion src/thirdparty/freetype/gzip/zutil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ typedef unsigned long ulg;
# define OS_CODE 0x05
#endif

#if defined(MACOS) || defined(TARGET_OS_MAC)
#if defined(__APPLE__) || defined(__MACH__)
# define OS_CODE 0x07
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
# include <unix.h> /* for fdopen */
Expand Down
Loading