glibc 2.3.x fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@374 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									2e255c6b9f
								
							
						
					
					
						commit
						b67d59594e
					
				
							
								
								
									
										8
									
								
								vl.c
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								vl.c
									
									
									
									
									
								
							@ -3247,7 +3247,6 @@ int main_loop(void *opaque)
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for(;;) {
 | 
					    for(;;) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
        ret = cpu_x86_exec(env);
 | 
					        ret = cpu_x86_exec(env);
 | 
				
			||||||
        if (reset_requested)
 | 
					        if (reset_requested)
 | 
				
			||||||
            break;
 | 
					            break;
 | 
				
			||||||
@ -3648,8 +3647,13 @@ int main(int argc, char **argv)
 | 
				
			|||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
#ifdef CONFIG_SDL
 | 
					#ifdef CONFIG_SDL
 | 
				
			||||||
        sdl_display_init(ds);
 | 
					        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
 | 
					#define sigaction __sigaction
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
        dumb_display_init(ds);
 | 
					        dumb_display_init(ds);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user