Skip to content

Commit 8c90bda

Browse files
authored
fix : ccxr compilation on macos (#1661)
1 parent 27e1a3c commit 8c90bda

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/thirdparty/freetype/gzip/ftzconf.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,14 @@
215215
# define FAR
216216
#endif
217217

218-
#if !defined(MACOS) && !defined(TARGET_OS_MAC)
218+
#if !defined(__APPLE__) && !defined(__MACH__)
219219
typedef unsigned char Byte; /* 8 bits */
220220
#endif
221+
222+
#if defined(__APPLE__) && defined(__MACH__)
223+
typedef char Byte; /* 8 bits(1 byte) */
224+
#endif
225+
221226
typedef unsigned int uInt; /* 16 bits or more */
222227
typedef unsigned long uLong; /* 32 bits or more */
223228

src/thirdparty/freetype/gzip/zutil.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ typedef unsigned long ulg;
105105
# define OS_CODE 0x05
106106
#endif
107107

108-
#if defined(MACOS) || defined(TARGET_OS_MAC)
108+
#if defined(__APPLE__) || defined(__MACH__)
109109
# define OS_CODE 0x07
110110
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
111111
# include <unix.h> /* for fdopen */

0 commit comments

Comments
 (0)