aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-09-16 21:46:04 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-09-16 21:46:04 +0000
commitb67d59594e36b61b06e70ec79d7aa639acac20d5 (patch)
tree04b1db55a505a7dcc2b5ff07b52c137045421a5d
parent2e255c6b9f05f78a7effc4d1246c8a420680b810 (diff)
glibc 2.3.x fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@374 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--vl.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index d517eeebe5..94d919643f 100644
--- a/vl.c
+++ b/vl.c
@@ -3247,7 +3247,6 @@ int main_loop(void *opaque)
}
for(;;) {
-
ret = cpu_x86_exec(env);
if (reset_requested)
break;
@@ -3648,8 +3647,13 @@ int main(int argc, char **argv)
} else {
#ifdef CONFIG_SDL
sdl_display_init(ds);
- /* the pthreads modify sigaction. We don't want that. */
+ /* SDL use the pthreads and they modify sigaction. We don't
+ want that. */
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)
+#define sigaction __libc_sigaction
+#else
#define sigaction __sigaction
+#endif
#else
dumb_display_init(ds);
#endif