diff options
| author | Mike Pall <mike> | 2026-06-24 16:20:30 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2026-06-24 16:20:30 +0200 |
| commit | 7ff85518540617c0f97c4720558bb21c245994a8 (patch) | |
| tree | 25f50cb46cab03cf39fc4a4f1daf819424d699b7 | |
| parent | 8e6520a7aecd0517e792b359afbbfd7274791f5f (diff) | |
| download | luajit-7ff85518540617c0f97c4720558bb21c245994a8.tar.gz luajit-7ff85518540617c0f97c4720558bb21c245994a8.tar.bz2 luajit-7ff85518540617c0f97c4720558bb21c245994a8.zip | |
iOS: Avoid macro name collision.
Reported by Andrey Filipenkov. #1477
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/lj_arch.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index bac0341e8..0b8c04f71 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -372,7 +372,7 @@ ifneq ($(HOST_SYS),$(TARGET_SYS)) | |||
| 372 | HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OSX | 372 | HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OSX |
| 373 | else | 373 | else |
| 374 | ifeq (iOS,$(TARGET_SYS)) | 374 | ifeq (iOS,$(TARGET_SYS)) |
| 375 | HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OSX -DTARGET_OS_IPHONE=1 | 375 | HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OSX -DLUAJIT_TARGET_IPHONE=1 |
| 376 | else | 376 | else |
| 377 | HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OTHER | 377 | HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OTHER |
| 378 | endif | 378 | endif |
diff --git a/src/lj_arch.h b/src/lj_arch.h index 3c4e3f9b0..7b7907ef5 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
| @@ -127,7 +127,7 @@ | |||
| 127 | #define LJ_TARGET_POSIX (LUAJIT_OS > LUAJIT_OS_WINDOWS) | 127 | #define LJ_TARGET_POSIX (LUAJIT_OS > LUAJIT_OS_WINDOWS) |
| 128 | #define LJ_TARGET_DLOPEN LJ_TARGET_POSIX | 128 | #define LJ_TARGET_DLOPEN LJ_TARGET_POSIX |
| 129 | 129 | ||
| 130 | #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE | 130 | #if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || LUAJIT_TARGET_IPHONE |
| 131 | #define LJ_TARGET_IOS 1 | 131 | #define LJ_TARGET_IOS 1 |
| 132 | #else | 132 | #else |
| 133 | #define LJ_TARGET_IOS 0 | 133 | #define LJ_TARGET_IOS 0 |