1.1 --- a/src/video/fbcon/SDL_fbevents.c Mon Jan 03 00:24:44 2005 +0000
1.2 +++ b/src/video/fbcon/SDL_fbevents.c Tue Jan 04 19:04:14 2005 +0000
1.3 @@ -835,7 +835,7 @@
1.4 static void switch_vt(_THIS, unsigned short which)
1.5 {
1.6 struct vt_stat vtstate;
1.7 - unsigned short current;
1.8 + unsigned short v_active;
1.9 SDL_Surface *screen;
1.10 __u16 saved_pal[3*256];
1.11 Uint32 screen_arealen;
1.12 @@ -846,7 +846,7 @@
1.13 (which == vtstate.v_active) ) {
1.14 return;
1.15 }
1.16 - current = vtstate.v_active;
1.17 + v_active = vtstate.v_active;
1.18
1.19 /* Save the contents of the screen, and go to text mode */
1.20 SDL_mutexP(hw_lock);
1.21 @@ -864,7 +864,7 @@
1.22 if ( ioctl(keyboard_fd, VT_ACTIVATE, which) == 0 ) {
1.23 /* Wait for our console to be activated again */
1.24 ioctl(keyboard_fd, VT_WAITACTIVE, which);
1.25 - while ( ioctl(keyboard_fd, VT_WAITACTIVE, current) < 0 ) {
1.26 + while ( ioctl(keyboard_fd, VT_WAITACTIVE, v_active) < 0 ) {
1.27 if ( (errno != EINTR) && (errno != EAGAIN) ) {
1.28 /* Unknown VT error - cancel this */
1.29 break;
2.1 --- a/src/video/fbcon/SDL_fbriva.c Mon Jan 03 00:24:44 2005 +0000
2.2 +++ b/src/video/fbcon/SDL_fbriva.c Tue Jan 04 19:04:14 2005 +0000
2.3 @@ -61,6 +61,7 @@
2.4 ;
2.5 }
2.6
2.7 +#if 0 /* Not yet implemented? */
2.8 /* Sets video mem colorkey and accelerated blit function */
2.9 static int SetHWColorKey(_THIS, SDL_Surface *surface, Uint32 key)
2.10 {
2.11 @@ -72,6 +73,7 @@
2.12 {
2.13 return(0);
2.14 }
2.15 +#endif /* Not yet implemented */
2.16
2.17 static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
2.18 {