src/video/fbcon/SDL_fbvideo.c
changeset 1361 19418e4422cb
parent 1358 c71e05b4dc2e
child 1373 04499d3e1b6b
--- a/src/video/fbcon/SDL_fbvideo.c	Fri Feb 10 07:29:08 2006 +0000
+++ b/src/video/fbcon/SDL_fbvideo.c	Thu Feb 16 10:11:48 2006 +0000
@@ -33,9 +33,9 @@
 
 #include "SDL_video.h"
 #include "SDL_mouse.h"
-#include "SDL_sysvideo.h"
-#include "SDL_pixels_c.h"
-#include "SDL_events_c.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
 #include "SDL_fbvideo.h"
 #include "SDL_fbmouse_c.h"
 #include "SDL_fbevents_c.h"
@@ -432,7 +432,7 @@
         return b->h - a->h;
 }
 
-static int FB_SortModes(_THIS)
+static void FB_SortModes(_THIS)
 {
 	int i;
 	for ( i=0; i<NUM_MODELISTS; ++i ) {
@@ -464,7 +464,7 @@
 		return(-1);
 	}
 
-#ifndef DISABLE_THREADS
+#if !SDL_THREADS_DISABLED
 	/* Create the hardware surface lock mutex */
 	hw_lock = SDL_CreateMutex();
 	if ( hw_lock == NULL ) {