diff options
| author | Mike Pall <mike> | 2016-04-03 19:08:32 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-04-03 19:08:32 +0200 |
| commit | 25b377942ab2707422167d5f04732bb7d6806f58 (patch) | |
| tree | 97569531ff81e2473b7bd60a68ef765a92e9584f /src/lj_arch.h | |
| parent | 296f0ca8d7c063cca1b6ddc0a48ceddff09d53b1 (diff) | |
| parent | 4ab6367b21527a20b76ce356153bc454e082b7d2 (diff) | |
| download | luajit-25b377942ab2707422167d5f04732bb7d6806f58.tar.gz luajit-25b377942ab2707422167d5f04732bb7d6806f58.tar.bz2 luajit-25b377942ab2707422167d5f04732bb7d6806f58.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_arch.h')
| -rw-r--r-- | src/lj_arch.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index 9144b968..612c7303 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
| @@ -68,7 +68,10 @@ | |||
| 68 | defined(__NetBSD__) || defined(__OpenBSD__) || \ | 68 | defined(__NetBSD__) || defined(__OpenBSD__) || \ |
| 69 | defined(__DragonFly__)) && !defined(__ORBIS__) | 69 | defined(__DragonFly__)) && !defined(__ORBIS__) |
| 70 | #define LUAJIT_OS LUAJIT_OS_BSD | 70 | #define LUAJIT_OS LUAJIT_OS_BSD |
| 71 | #elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__) | 71 | #elif (defined(__sun__) && defined(__svr4__)) |
| 72 | #define LUAJIT_OS LUAJIT_OS_POSIX | ||
| 73 | #elif defined(__CYGWIN__) | ||
| 74 | #define LJ_TARGET_CYGWIN 1 | ||
| 72 | #define LUAJIT_OS LUAJIT_OS_POSIX | 75 | #define LUAJIT_OS LUAJIT_OS_POSIX |
| 73 | #else | 76 | #else |
| 74 | #define LUAJIT_OS LUAJIT_OS_OTHER | 77 | #define LUAJIT_OS LUAJIT_OS_OTHER |
| @@ -137,7 +140,7 @@ | |||
| 137 | #define LJ_ARCH_NAME "x86" | 140 | #define LJ_ARCH_NAME "x86" |
| 138 | #define LJ_ARCH_BITS 32 | 141 | #define LJ_ARCH_BITS 32 |
| 139 | #define LJ_ARCH_ENDIAN LUAJIT_LE | 142 | #define LJ_ARCH_ENDIAN LUAJIT_LE |
| 140 | #if LJ_TARGET_WINDOWS || __CYGWIN__ | 143 | #if LJ_TARGET_WINDOWS || LJ_TARGET_CYGWIN |
| 141 | #define LJ_ABI_WIN 1 | 144 | #define LJ_ABI_WIN 1 |
| 142 | #else | 145 | #else |
| 143 | #define LJ_ABI_WIN 0 | 146 | #define LJ_ABI_WIN 0 |
| @@ -155,7 +158,7 @@ | |||
| 155 | #define LJ_ARCH_NAME "x64" | 158 | #define LJ_ARCH_NAME "x64" |
| 156 | #define LJ_ARCH_BITS 64 | 159 | #define LJ_ARCH_BITS 64 |
| 157 | #define LJ_ARCH_ENDIAN LUAJIT_LE | 160 | #define LJ_ARCH_ENDIAN LUAJIT_LE |
| 158 | #if LJ_TARGET_WINDOWS || __CYGWIN__ | 161 | #if LJ_TARGET_WINDOWS || LJ_TARGET_CYGWIN |
| 159 | #define LJ_ABI_WIN 1 | 162 | #define LJ_ABI_WIN 1 |
| 160 | #else | 163 | #else |
| 161 | #define LJ_ABI_WIN 0 | 164 | #define LJ_ABI_WIN 0 |