--- a/src/video/fbcon/SDL_fbevents.c Mon Jan 03 00:24:44 2005 +0000
+++ b/src/video/fbcon/SDL_fbevents.c Tue Jan 04 19:04:14 2005 +0000
@@ -835,7 +835,7 @@
static void switch_vt(_THIS, unsigned short which)
{
struct vt_stat vtstate;
- unsigned short current;
+ unsigned short v_active;
SDL_Surface *screen;
__u16 saved_pal[3*256];
Uint32 screen_arealen;
@@ -846,7 +846,7 @@
(which == vtstate.v_active) ) {
return;
}
- current = vtstate.v_active;
+ v_active = vtstate.v_active;
/* Save the contents of the screen, and go to text mode */
SDL_mutexP(hw_lock);
@@ -864,7 +864,7 @@
if ( ioctl(keyboard_fd, VT_ACTIVATE, which) == 0 ) {
/* Wait for our console to be activated again */
ioctl(keyboard_fd, VT_WAITACTIVE, which);
- while ( ioctl(keyboard_fd, VT_WAITACTIVE, current) < 0 ) {
+ while ( ioctl(keyboard_fd, VT_WAITACTIVE, v_active) < 0 ) {
if ( (errno != EINTR) && (errno != EAGAIN) ) {
/* Unknown VT error - cancel this */
break;
--- a/src/video/fbcon/SDL_fbriva.c Mon Jan 03 00:24:44 2005 +0000
+++ b/src/video/fbcon/SDL_fbriva.c Tue Jan 04 19:04:14 2005 +0000
@@ -61,6 +61,7 @@
;
}
+#if 0 /* Not yet implemented? */
/* Sets video mem colorkey and accelerated blit function */
static int SetHWColorKey(_THIS, SDL_Surface *surface, Uint32 key)
{
@@ -72,6 +73,7 @@
{
return(0);
}
+#endif /* Not yet implemented */
static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
{