From 7ff85518540617c0f97c4720558bb21c245994a8 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Wed, 24 Jun 2026 16:20:30 +0200 Subject: [PATCH] iOS: Avoid macro name collision. Reported by Andrey Filipenkov. #1477 --- src/Makefile | 2 +- src/lj_arch.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index bac0341e..0b8c04f7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -372,7 +372,7 @@ ifneq ($(HOST_SYS),$(TARGET_SYS)) HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OSX else ifeq (iOS,$(TARGET_SYS)) - HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OSX -DTARGET_OS_IPHONE=1 + HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OSX -DLUAJIT_TARGET_IPHONE=1 else HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OTHER endif diff --git a/src/lj_arch.h b/src/lj_arch.h index 3c4e3f9b..7b7907ef 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h @@ -127,7 +127,7 @@ #define LJ_TARGET_POSIX (LUAJIT_OS > LUAJIT_OS_WINDOWS) #define LJ_TARGET_DLOPEN LJ_TARGET_POSIX -#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE +#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || LUAJIT_TARGET_IPHONE #define LJ_TARGET_IOS 1 #else #define LJ_TARGET_IOS 0 -- 2.47.3