projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e255c6
)
glibc 2.3.x fix
author
bellard
<bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Tue, 16 Sep 2003 21:46:04 +0000
(21:46 +0000)
committer
bellard
<bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Tue, 16 Sep 2003 21:46:04 +0000
(21:46 +0000)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@374
c046a42c
-6fe2-441c-8c8c-
71466251a162
vl.c
patch
|
blob
|
history
diff --git
a/vl.c
b/vl.c
index d517eeebe58b42b6bdeba410a241727a6f37b0fd..94d919643f07956c28954230873dfcb0299e4b86 100644
(file)
--- 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