Commit b67d59594e36b61b06e70ec79d7aa639acac20d5
1 parent
2e255c6b
glibc 2.3.x fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@374 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
6 additions
and
2 deletions
vl.c
| @@ -3247,7 +3247,6 @@ int main_loop(void *opaque) | @@ -3247,7 +3247,6 @@ int main_loop(void *opaque) | ||
| 3247 | } | 3247 | } |
| 3248 | 3248 | ||
| 3249 | for(;;) { | 3249 | for(;;) { |
| 3250 | - | ||
| 3251 | ret = cpu_x86_exec(env); | 3250 | ret = cpu_x86_exec(env); |
| 3252 | if (reset_requested) | 3251 | if (reset_requested) |
| 3253 | break; | 3252 | break; |
| @@ -3648,8 +3647,13 @@ int main(int argc, char **argv) | @@ -3648,8 +3647,13 @@ int main(int argc, char **argv) | ||
| 3648 | } else { | 3647 | } else { |
| 3649 | #ifdef CONFIG_SDL | 3648 | #ifdef CONFIG_SDL |
| 3650 | sdl_display_init(ds); | 3649 | sdl_display_init(ds); |
| 3651 | - /* the pthreads modify sigaction. We don't want that. */ | 3650 | + /* SDL use the pthreads and they modify sigaction. We don't |
| 3651 | + want that. */ | ||
| 3652 | +#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) | ||
| 3653 | +#define sigaction __libc_sigaction | ||
| 3654 | +#else | ||
| 3652 | #define sigaction __sigaction | 3655 | #define sigaction __sigaction |
| 3656 | +#endif | ||
| 3653 | #else | 3657 | #else |
| 3654 | dumb_display_init(ds); | 3658 | dumb_display_init(ds); |
| 3655 | #endif | 3659 | #endif |