diff options
| author | Mike Pall <mike> | 2014-10-07 16:18:46 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-10-07 16:18:46 +0200 |
| commit | be64823d957bea318e374d7a16a3985158b76cbb (patch) | |
| tree | 8e4865fc4f9491923596098d2d6b8991bee7c74e /src/lj_arch.h | |
| parent | 0de431e3f7ab6fa31a56042f2c10ababe0b2b4ab (diff) | |
| parent | 4846a714a9b8e01bac8f9fc1de0eb2a5f00ea79b (diff) | |
| download | luajit-be64823d957bea318e374d7a16a3985158b76cbb.tar.gz luajit-be64823d957bea318e374d7a16a3985158b76cbb.tar.bz2 luajit-be64823d957bea318e374d7a16a3985158b76cbb.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_arch.h')
| -rw-r--r-- | src/lj_arch.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index 10ff5529..da16a193 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
| @@ -67,7 +67,8 @@ | |||
| 67 | #elif defined(__MACH__) && defined(__APPLE__) | 67 | #elif defined(__MACH__) && defined(__APPLE__) |
| 68 | #define LUAJIT_OS LUAJIT_OS_OSX | 68 | #define LUAJIT_OS LUAJIT_OS_OSX |
| 69 | #elif (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ | 69 | #elif (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ |
| 70 | defined(__NetBSD__) || defined(__OpenBSD__)) && !defined(__ORBIS__) | 70 | defined(__NetBSD__) || defined(__OpenBSD__) || \ |
| 71 | defined(__DragonFly__)) && !defined(__ORBIS__) | ||
| 71 | #define LUAJIT_OS LUAJIT_OS_BSD | 72 | #define LUAJIT_OS LUAJIT_OS_BSD |
| 72 | #elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__) | 73 | #elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__) |
| 73 | #define LUAJIT_OS LUAJIT_OS_POSIX | 74 | #define LUAJIT_OS LUAJIT_OS_POSIX |