From b480c8b21dbbce349b69bed2acf33203abe11110 Mon Sep 17 00:00:00 2001 From: vats004 Date: Sun, 23 Feb 2025 10:00:06 +0530 Subject: [PATCH] fix : ccxr compilation on macos --- src/thirdparty/freetype/gzip/ftzconf.h | 7 ++++++- src/thirdparty/freetype/gzip/zutil.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/thirdparty/freetype/gzip/ftzconf.h b/src/thirdparty/freetype/gzip/ftzconf.h index 3abf0ba03..616798b87 100644 --- a/src/thirdparty/freetype/gzip/ftzconf.h +++ b/src/thirdparty/freetype/gzip/ftzconf.h @@ -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 */ diff --git a/src/thirdparty/freetype/gzip/zutil.h b/src/thirdparty/freetype/gzip/zutil.h index c9688cd9c..dc18e98e9 100644 --- a/src/thirdparty/freetype/gzip/zutil.h +++ b/src/thirdparty/freetype/gzip/zutil.h @@ -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 /* for fdopen */