fix : ccxr compilation on macos (#1661)

CCExtractor · Feb 23, 2025 · 8c90bda · 8c90bda
1 parent 27e1a3c
commit 8c90bda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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 */