diff options
-rw-r--r-- | src/lj_arch.h | 3 | ||||
-rw-r--r-- | src/lj_prng.c | 2 | ||||
-rw-r--r-- | src/lj_profile.c | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index 882c99cb..5fb798d9 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
@@ -93,6 +93,9 @@ | |||
93 | #elif defined(__CYGWIN__) | 93 | #elif defined(__CYGWIN__) |
94 | #define LJ_TARGET_CYGWIN 1 | 94 | #define LJ_TARGET_CYGWIN 1 |
95 | #define LUAJIT_OS LUAJIT_OS_POSIX | 95 | #define LUAJIT_OS LUAJIT_OS_POSIX |
96 | #elif defined(__QNX__) | ||
97 | #define LJ_TARGET_QNX 1 | ||
98 | #define LUAJIT_OS LUAJIT_OS_POSIX | ||
96 | #else | 99 | #else |
97 | #define LUAJIT_OS LUAJIT_OS_OTHER | 100 | #define LUAJIT_OS LUAJIT_OS_OTHER |
98 | #endif | 101 | #endif |
diff --git a/src/lj_prng.c b/src/lj_prng.c index 9e57505e..01935e57 100644 --- a/src/lj_prng.c +++ b/src/lj_prng.c | |||
@@ -125,7 +125,7 @@ static PRGR libfunc_rgr; | |||
125 | #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 | 125 | #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 |
126 | #define LJ_TARGET_HAS_GETENTROPY 1 | 126 | #define LJ_TARGET_HAS_GETENTROPY 1 |
127 | #endif | 127 | #endif |
128 | #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN | 128 | #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN || LJ_TARGET_QNX |
129 | #define LJ_TARGET_HAS_GETENTROPY 1 | 129 | #define LJ_TARGET_HAS_GETENTROPY 1 |
130 | #endif | 130 | #endif |
131 | 131 | ||
diff --git a/src/lj_profile.c b/src/lj_profile.c index f0af91cb..4a13537d 100644 --- a/src/lj_profile.c +++ b/src/lj_profile.c | |||
@@ -185,7 +185,11 @@ static void profile_timer_start(ProfileState *ps) | |||
185 | tm.it_value.tv_sec = tm.it_interval.tv_sec = interval / 1000; | 185 | tm.it_value.tv_sec = tm.it_interval.tv_sec = interval / 1000; |
186 | tm.it_value.tv_usec = tm.it_interval.tv_usec = (interval % 1000) * 1000; | 186 | tm.it_value.tv_usec = tm.it_interval.tv_usec = (interval % 1000) * 1000; |
187 | setitimer(ITIMER_PROF, &tm, NULL); | 187 | setitimer(ITIMER_PROF, &tm, NULL); |
188 | #if LJ_TARGET_QNX | ||
189 | sa.sa_flags = 0; | ||
190 | #else | ||
188 | sa.sa_flags = SA_RESTART; | 191 | sa.sa_flags = SA_RESTART; |
192 | #endif | ||
189 | sa.sa_handler = profile_signal; | 193 | sa.sa_handler = profile_signal; |
190 | sigemptyset(&sa.sa_mask); | 194 | sigemptyset(&sa.sa_mask); |
191 | sigaction(SIGPROF, &sa, &ps->oldsa); | 195 | sigaction(SIGPROF, &sa, &ps->oldsa); |