From ad364363d4840c351490afb5ae853669aee7c8a6 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 17 Jun 2010 22:23:20 -0700
Subject: [PATCH] Hello Sam.

I did fix/update the SDL 1.3 pandora port today ( 11 june 2010 ) and you can find the "hg diff" attached :)

David Carr? ( Cpasjuste )
---
 Makefile.pandora                | 7 ++++---
 include/SDL_config_pandora.h    | 6 ++++++
 src/video/pandora/SDL_pandora.h | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile.pandora b/Makefile.pandora
index 24e4e0bab..60ac8d563 100644
--- a/Makefile.pandora
+++ b/Makefile.pandora
@@ -12,14 +12,15 @@ CFLAGS  = -O3 -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp
 
 TARGET  = libSDL.a
 
-SOURCES = ./src/*.c ./src/audio/*.c ./src/cdrom/*.c ./src/cpuinfo/*.c ./src/events/*.c \
+SOURCES = ./src/*.c ./src/audio/*.c ./src/cpuinfo/*.c ./src/events/*.c \
 	./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \
 	./src/joystick/*.c ./src/haptic/*.c ./src/power/*.c ./src/video/dummy/*.c ./src/audio/disk/*.c \
 	./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c ./src/audio/dma/*.c \
 	./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \
 	./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \
-	./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c ./src/cdrom/dummy/*.c \
-	./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o ./src/video/x11/*.c
+	./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c \
+	./src/atomic/linux/*.c \
+	./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o ./src/video/x11/*.c 
 	
 
 OBJECTS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g')
diff --git a/include/SDL_config_pandora.h b/include/SDL_config_pandora.h
index 227831e63..fbdec93e1 100644
--- a/include/SDL_config_pandora.h
+++ b/include/SDL_config_pandora.h
@@ -28,6 +28,12 @@
 /* General platform specific identifiers */
 #include "SDL_platform.h"
 
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+
 #define SDL_HAS_64BIT_TYPE 1
 #define SDL_BYTEORDER 1234
 
diff --git a/src/video/pandora/SDL_pandora.h b/src/video/pandora/SDL_pandora.h
index 759fc39e4..8597baa07 100644
--- a/src/video/pandora/SDL_pandora.h
+++ b/src/video/pandora/SDL_pandora.h
@@ -68,8 +68,8 @@ typedef struct SDL_WindowData
 /* Display and window functions */
 int PND_videoinit(_THIS);
 void PND_videoquit(_THIS);
-void PND_getdisplaymodes(_THIS);
-int PND_setdisplaymode(_THIS, SDL_DisplayMode * mode);
+void PND_getdisplaymodes(_THIS, SDL_VideoDisplay * display);
+int PND_setdisplaymode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
 int PND_setdisplaypalette(_THIS, SDL_Palette * palette);
 int PND_getdisplaypalette(_THIS, SDL_Palette * palette);
 int PND_setdisplaygammaramp(_THIS, Uint16 * ramp);