[SDL] Can't compile libsdl 1.2.8 on AMD64

[Stephane Marchesin]

Jure Repinc wrote:

>Hi,
>
>I just tried to compile libsdl 1.2.8 on a 64-bit AMD64 machine with
>GCC 3.4.3. I get this error when trying to compile:
>
Does this patch work ?

Stephane

-------------- next part --------------
Index: SDL_fbevents.c
===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/fbcon/SDL_fbevents.c,v
retrieving revision 1.13
diff -u -r1.13 SDL_fbevents.c
--- SDL_fbevents.c	4 Jan 2004 16:49:25 -0000	1.13
+++ SDL_fbevents.c	3 Jan 2005 00:53:27 -0000
@@ -835,7 +835,7 @@
 static void switch_vt(_THIS, unsigned short which)
 {
 	struct vt_stat vtstate;
-	unsigned short current;
+	unsigned short currentv;
 	SDL_Surface *screen;
 	__u16 saved_pal[3*256];
 	Uint32 screen_arealen;
@@ -846,7 +846,7 @@
 	     (which == vtstate.v_active) ) {
 		return;
 	}
-	current = vtstate.v_active;
+	currentv = 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, currentv) < 0 ) {
 			if ( (errno != EINTR) && (errno != EAGAIN) ) {
 				/* Unknown VT error - cancel this */
 				break;