From 7adb398fe4c466490fb4226108541f1a2a13db5c Mon Sep 17 00:00:00 2001 From: mazze Date: Sat, 9 May 2015 15:59:52 +0000 Subject: [PATCH] Fix for the problem that SDL applications exited with an unfreed signal. close_timer() was originally called by atexit() but that had been disabled in the shared library. The fix calls close_timer() in ADD2CLOSELIB(). This closes bug report https://sourceforge.net/p/aros/bugs/480/ git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@50636 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- SDL/SDL_main/SDL-1.2.15-aros.diff | 804 +++++++++++++++++++------------------- 1 file changed, 404 insertions(+), 400 deletions(-) diff --git a/SDL/SDL_main/SDL-1.2.15-aros.diff b/SDL/SDL_main/SDL-1.2.15-aros.diff index 8b7246a1f..218693c45 100644 --- a/SDL/SDL_main/SDL-1.2.15-aros.diff +++ b/SDL/SDL_main/SDL-1.2.15-aros.diff @@ -1,6 +1,6 @@ -diff -ruN SDL-1.2.15/aros/sdl-config SDL-1.2.15-aros/aros/sdl-config ---- SDL-1.2.15/aros/sdl-config 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/aros/sdl-config 2014-08-23 18:00:56.996780026 +0200 +diff -Naur SDL-1.2.15-orig/aros/sdl-config SDL-1.2.15/aros/sdl-config +--- SDL-1.2.15-orig/aros/sdl-config 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/aros/sdl-config 2015-05-09 15:09:59.750739542 +0200 @@ -0,0 +1,58 @@ +#!/bin/sh + @@ -60,9 +60,9 @@ diff -ruN SDL-1.2.15/aros/sdl-config SDL-1.2.15-aros/aros/sdl-config + esac + shift +done -diff -ruN SDL-1.2.15/aros/sdl.pc SDL-1.2.15-aros/aros/sdl.pc ---- SDL-1.2.15/aros/sdl.pc 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/aros/sdl.pc 2014-08-23 18:00:56.996780026 +0200 +diff -Naur SDL-1.2.15-orig/aros/sdl.pc SDL-1.2.15/aros/sdl.pc +--- SDL-1.2.15-orig/aros/sdl.pc 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/aros/sdl.pc 2015-05-09 15:09:59.750739542 +0200 @@ -0,0 +1,15 @@ +# sdl pkg-config source file + @@ -79,9 +79,9 @@ diff -ruN SDL-1.2.15/aros/sdl.pc SDL-1.2.15-aros/aros/sdl.pc +Libs: -L${libdir} -lSDL +Libs.private: -lSDL -lm -lGL +Cflags: -I${includedir}/SDL -D_GNU_SOURCE=1 -diff -ruN SDL-1.2.15/aros_init.c SDL-1.2.15-aros/aros_init.c ---- SDL-1.2.15/aros_init.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/aros_init.c 2014-08-23 19:54:07.944896598 +0200 +diff -Naur SDL-1.2.15-orig/aros_init.c SDL-1.2.15/aros_init.c +--- SDL-1.2.15-orig/aros_init.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/aros_init.c 2015-05-09 15:09:59.750739542 +0200 @@ -0,0 +1,148 @@ +/* Copyright 2013 The AROS Development Team. All rights reserved. */ + @@ -231,9 +231,9 @@ diff -ruN SDL-1.2.15/aros_init.c SDL-1.2.15-aros/aros_init.c +} + +ADD2OPENLIB(__posixc_startup, -50); -diff -ruN SDL-1.2.15/include/SDL_active.h SDL-1.2.15-aros/include/SDL_active.h ---- SDL-1.2.15/include/SDL_active.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_active.h 2014-08-23 18:00:57.004780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_active.h SDL-1.2.15/include/SDL_active.h +--- SDL-1.2.15-orig/include/SDL_active.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_active.h 2015-05-09 15:09:59.750739542 +0200 @@ -51,8 +51,9 @@ * SDL_APPACTIVE. If SDL_APPACTIVE is set, then the user is able to * see your application, otherwise it has been iconified or disabled. @@ -245,9 +245,9 @@ diff -ruN SDL-1.2.15/include/SDL_active.h SDL-1.2.15-aros/include/SDL_active.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_audio.h SDL-1.2.15-aros/include/SDL_audio.h ---- SDL-1.2.15/include/SDL_audio.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_audio.h 2014-08-23 18:00:57.004780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_audio.h SDL-1.2.15/include/SDL_audio.h +--- SDL-1.2.15-orig/include/SDL_audio.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_audio.h 2015-05-09 15:09:59.750739542 +0200 @@ -88,7 +88,11 @@ * Once the callback returns, the buffer will no longer be valid. * Stereo samples are stored in a LRLRLR ordering. @@ -338,9 +338,9 @@ diff -ruN SDL-1.2.15/include/SDL_audio.h SDL-1.2.15-aros/include/SDL_audio.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_cdrom.h SDL-1.2.15-aros/include/SDL_cdrom.h ---- SDL-1.2.15/include/SDL_cdrom.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_cdrom.h 2014-08-23 18:00:57.004780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_cdrom.h SDL-1.2.15/include/SDL_cdrom.h +--- SDL-1.2.15-orig/include/SDL_cdrom.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_cdrom.h 2015-05-09 15:09:59.750739542 +0200 @@ -111,6 +111,7 @@ * Returns the number of CD-ROM drives on the system, or -1 if * SDL_Init() has not been called with the SDL_INIT_CDROM flag. @@ -358,9 +358,9 @@ diff -ruN SDL-1.2.15/include/SDL_cdrom.h SDL-1.2.15-aros/include/SDL_cdrom.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_config_aros.h SDL-1.2.15-aros/include/SDL_config_aros.h ---- SDL-1.2.15/include/SDL_config_aros.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_config_aros.h 2014-08-23 18:00:57.004780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_config_aros.h SDL-1.2.15/include/SDL_config_aros.h +--- SDL-1.2.15-orig/include/SDL_config_aros.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/include/SDL_config_aros.h 2015-05-09 15:09:59.750739542 +0200 @@ -0,0 +1,152 @@ +/* + SDL - Simple DirectMedia Layer @@ -514,9 +514,9 @@ diff -ruN SDL-1.2.15/include/SDL_config_aros.h SDL-1.2.15-aros/include/SDL_confi +//#define AMIGADEBUG 1 + +#endif /* _SDL_config_aros_h */ -diff -ruN SDL-1.2.15/include/SDL_config.h SDL-1.2.15-aros/include/SDL_config.h ---- SDL-1.2.15/include/SDL_config.h 2012-01-19 07:30:30.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_config.h 2014-08-23 18:00:57.004780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_config.h SDL-1.2.15/include/SDL_config.h +--- SDL-1.2.15-orig/include/SDL_config.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_config.h 2015-05-09 15:09:59.750739542 +0200 @@ -26,7 +26,9 @@ #include "SDL_platform.h" @@ -528,9 +528,9 @@ diff -ruN SDL-1.2.15/include/SDL_config.h SDL-1.2.15-aros/include/SDL_config.h #include "SDL_config_dreamcast.h" #elif defined(__MACOS__) #include "SDL_config_macos.h" -diff -ruN SDL-1.2.15/include/SDL_cpuinfo.h SDL-1.2.15-aros/include/SDL_cpuinfo.h ---- SDL-1.2.15/include/SDL_cpuinfo.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_cpuinfo.h 2014-08-23 18:00:57.008780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_cpuinfo.h SDL-1.2.15/include/SDL_cpuinfo.h +--- SDL-1.2.15-orig/include/SDL_cpuinfo.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_cpuinfo.h 2015-05-09 15:09:59.750739542 +0200 @@ -36,6 +36,7 @@ extern "C" { #endif @@ -547,9 +547,9 @@ diff -ruN SDL-1.2.15/include/SDL_cpuinfo.h SDL-1.2.15-aros/include/SDL_cpuinfo.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_error.h SDL-1.2.15-aros/include/SDL_error.h ---- SDL-1.2.15/include/SDL_error.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_error.h 2014-08-23 18:00:57.008780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_error.h SDL-1.2.15/include/SDL_error.h +--- SDL-1.2.15-orig/include/SDL_error.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_error.h 2015-05-09 15:09:59.750739542 +0200 @@ -40,9 +40,23 @@ * @name Public functions */ @@ -593,9 +593,9 @@ diff -ruN SDL-1.2.15/include/SDL_error.h SDL-1.2.15-aros/include/SDL_error.h /*@}*/ /* Ends C function definitions when using C++ */ -diff -ruN SDL-1.2.15/include/SDL_events.h SDL-1.2.15-aros/include/SDL_events.h ---- SDL-1.2.15/include/SDL_events.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_events.h 2014-08-23 18:00:57.008780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_events.h SDL-1.2.15/include/SDL_events.h +--- SDL-1.2.15-orig/include/SDL_events.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_events.h 2015-05-09 15:09:59.750739542 +0200 @@ -248,7 +248,9 @@ * This function updates the event queue and internal input device state. * This should only be run in the thread that sets the video mode. @@ -649,9 +649,9 @@ diff -ruN SDL-1.2.15/include/SDL_events.h SDL-1.2.15-aros/include/SDL_events.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_joystick.h SDL-1.2.15-aros/include/SDL_joystick.h ---- SDL-1.2.15/include/SDL_joystick.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_joystick.h 2014-08-23 18:00:57.008780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_joystick.h SDL-1.2.15/include/SDL_joystick.h +--- SDL-1.2.15-orig/include/SDL_joystick.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_joystick.h 2015-05-09 15:09:59.751739540 +0200 @@ -50,6 +50,7 @@ /** * Count the number of joysticks attached to the system @@ -686,9 +686,9 @@ diff -ruN SDL-1.2.15/include/SDL_joystick.h SDL-1.2.15-aros/include/SDL_joystick /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_keyboard.h SDL-1.2.15-aros/include/SDL_keyboard.h ---- SDL-1.2.15/include/SDL_keyboard.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_keyboard.h 2014-08-23 18:00:57.008780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_keyboard.h SDL-1.2.15/include/SDL_keyboard.h +--- SDL-1.2.15-orig/include/SDL_keyboard.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_keyboard.h 2015-05-09 15:09:59.751739540 +0200 @@ -79,7 +79,9 @@ * * @return It returns the previous state of keyboard translation. @@ -716,9 +716,9 @@ diff -ruN SDL-1.2.15/include/SDL_keyboard.h SDL-1.2.15-aros/include/SDL_keyboard /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_loadso.h SDL-1.2.15-aros/include/SDL_loadso.h ---- SDL-1.2.15/include/SDL_loadso.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_loadso.h 2014-08-23 18:00:57.008780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_loadso.h SDL-1.2.15/include/SDL_loadso.h +--- SDL-1.2.15-orig/include/SDL_loadso.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_loadso.h 2015-05-09 15:09:59.751739540 +0200 @@ -57,6 +57,7 @@ * to the object handle (or NULL if there was an error). * The 'sofile' parameter is a system dependent name of the object file. @@ -735,9 +735,9 @@ diff -ruN SDL-1.2.15/include/SDL_loadso.h SDL-1.2.15-aros/include/SDL_loadso.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_main.h SDL-1.2.15-aros/include/SDL_main.h ---- SDL-1.2.15/include/SDL_main.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_main.h 2014-08-23 18:00:57.012780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_main.h SDL-1.2.15/include/SDL_main.h +--- SDL-1.2.15-orig/include/SDL_main.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_main.h 2015-05-09 15:09:59.751739540 +0200 @@ -66,12 +66,14 @@ extern "C" { #endif @@ -767,9 +767,9 @@ diff -ruN SDL-1.2.15/include/SDL_main.h SDL-1.2.15-aros/include/SDL_main.h #ifdef __cplusplus } -diff -ruN SDL-1.2.15/include/SDL_mouse.h SDL-1.2.15-aros/include/SDL_mouse.h ---- SDL-1.2.15/include/SDL_mouse.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_mouse.h 2014-08-23 18:00:57.012780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_mouse.h SDL-1.2.15/include/SDL_mouse.h +--- SDL-1.2.15-orig/include/SDL_mouse.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_mouse.h 2015-05-09 15:09:59.751739540 +0200 @@ -54,6 +54,7 @@ * be tested using the SDL_BUTTON(X) macros, and x and y are set to the * current mouse cursor position. You can pass NULL for either x or y. @@ -786,9 +786,9 @@ diff -ruN SDL-1.2.15/include/SDL_mouse.h SDL-1.2.15-aros/include/SDL_mouse.h /*@{*/ /** Used as a mask when testing buttons in buttonstate -diff -ruN SDL-1.2.15/include/SDL_mutex.h SDL-1.2.15-aros/include/SDL_mutex.h ---- SDL-1.2.15/include/SDL_mutex.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_mutex.h 2014-08-23 18:00:57.012780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_mutex.h SDL-1.2.15/include/SDL_mutex.h +--- SDL-1.2.15-orig/include/SDL_mutex.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_mutex.h 2015-05-09 15:09:59.751739540 +0200 @@ -56,13 +56,17 @@ typedef struct SDL_mutex SDL_mutex; @@ -858,9 +858,9 @@ diff -ruN SDL-1.2.15/include/SDL_mutex.h SDL-1.2.15-aros/include/SDL_mutex.h /*@}*/ /* Ends C function definitions when using C++ */ -diff -ruN SDL-1.2.15/include/SDL_rwops.h SDL-1.2.15-aros/include/SDL_rwops.h ---- SDL-1.2.15/include/SDL_rwops.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_rwops.h 2014-08-23 18:00:57.012780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_rwops.h SDL-1.2.15/include/SDL_rwops.h +--- SDL-1.2.15-orig/include/SDL_rwops.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_rwops.h 2015-05-09 15:09:59.751739540 +0200 @@ -60,7 +60,6 @@ /** Close and free an allocated SDL_FSops structure */ @@ -917,9 +917,9 @@ diff -ruN SDL-1.2.15/include/SDL_rwops.h SDL-1.2.15-aros/include/SDL_rwops.h /*@}*/ /* Ends C function definitions when using C++ */ -diff -ruN SDL-1.2.15/include/SDL_syswm.h SDL-1.2.15-aros/include/SDL_syswm.h ---- SDL-1.2.15/include/SDL_syswm.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_syswm.h 2014-08-23 18:00:57.012780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_syswm.h SDL-1.2.15/include/SDL_syswm.h +--- SDL-1.2.15-orig/include/SDL_syswm.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_syswm.h 2015-05-09 15:09:59.751739540 +0200 @@ -214,8 +214,9 @@ * if ( SDL_GetWMInfo(&info) ) { ... } * @endcode @@ -931,9 +931,9 @@ diff -ruN SDL-1.2.15/include/SDL_syswm.h SDL-1.2.15-aros/include/SDL_syswm.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_thread.h SDL-1.2.15-aros/include/SDL_thread.h ---- SDL-1.2.15/include/SDL_thread.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_thread.h 2014-08-23 18:00:57.012780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_thread.h SDL-1.2.15/include/SDL_thread.h +--- SDL-1.2.15-orig/include/SDL_thread.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_thread.h 2015-05-09 15:09:59.752739538 +0200 @@ -75,7 +75,9 @@ typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code); #endif @@ -967,9 +967,9 @@ diff -ruN SDL-1.2.15/include/SDL_thread.h SDL-1.2.15-aros/include/SDL_thread.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_timer.h SDL-1.2.15-aros/include/SDL_timer.h ---- SDL-1.2.15/include/SDL_timer.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_timer.h 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_timer.h SDL-1.2.15/include/SDL_timer.h +--- SDL-1.2.15-orig/include/SDL_timer.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_timer.h 2015-05-09 15:09:59.752739538 +0200 @@ -46,10 +46,12 @@ * Get the number of milliseconds since the SDL library initialization. * Note that this value wraps if the program runs for more than ~49 days. @@ -1010,9 +1010,9 @@ diff -ruN SDL-1.2.15/include/SDL_timer.h SDL-1.2.15-aros/include/SDL_timer.h /*@}*/ /* Ends C function definitions when using C++ */ -diff -ruN SDL-1.2.15/include/SDL_version.h SDL-1.2.15-aros/include/SDL_version.h ---- SDL-1.2.15/include/SDL_version.h 2012-01-19 07:30:05.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_version.h 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_version.h SDL-1.2.15/include/SDL_version.h +--- SDL-1.2.15-orig/include/SDL_version.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_version.h 2015-05-09 15:09:59.752739538 +0200 @@ -80,7 +80,9 @@ * it should NOT be used to fill a version structure, instead you should * use the SDL_Version() macro. @@ -1023,9 +1023,9 @@ diff -ruN SDL-1.2.15/include/SDL_version.h SDL-1.2.15-aros/include/SDL_version.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus -diff -ruN SDL-1.2.15/include/SDL_video.h SDL-1.2.15-aros/include/SDL_video.h ---- SDL-1.2.15/include/SDL_video.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/include/SDL_video.h 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/include/SDL_video.h SDL-1.2.15/include/SDL_video.h +--- SDL-1.2.15-orig/include/SDL_video.h 2015-05-09 17:47:54.271774326 +0200 ++++ SDL-1.2.15/include/SDL_video.h 2015-05-09 15:09:59.752739538 +0200 @@ -119,6 +119,9 @@ /** Reference count -- used when freeing surface */ @@ -1133,9 +1133,9 @@ diff -ruN SDL-1.2.15/include/SDL_video.h SDL-1.2.15-aros/include/SDL_video.h /* Ends C function definitions when using C++ */ #ifdef __cplusplus } -diff -ruN SDL-1.2.15/SDL.conf SDL-1.2.15-aros/SDL.conf ---- SDL-1.2.15/SDL.conf 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/SDL.conf 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/SDL.conf SDL-1.2.15/SDL.conf +--- SDL-1.2.15-orig/SDL.conf 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/SDL.conf 2015-05-09 15:09:59.752739538 +0200 @@ -0,0 +1,241 @@ +##begin config +basename SDL @@ -1378,9 +1378,9 @@ diff -ruN SDL-1.2.15/SDL.conf SDL-1.2.15-aros/SDL.conf +SDL_bool SDL_HasSSE2() () +char *SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf, size_t inbytesleft) (A0, A1, A2, D0) +##end functionlist -diff -ruN SDL-1.2.15/SDL_intern.h SDL-1.2.15-aros/SDL_intern.h ---- SDL-1.2.15/SDL_intern.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/SDL_intern.h 2014-08-23 19:52:10.768894587 +0200 +diff -Naur SDL-1.2.15-orig/SDL_intern.h SDL-1.2.15/SDL_intern.h +--- SDL-1.2.15-orig/SDL_intern.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/SDL_intern.h 2015-05-09 15:09:59.753739536 +0200 @@ -0,0 +1,161 @@ +#ifndef _SDL_INTERN_H +#define _SDL_INTERN_H @@ -1543,9 +1543,9 @@ diff -ruN SDL-1.2.15/SDL_intern.h SDL-1.2.15-aros/SDL_intern.h +}; + +#endif -diff -ruN SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.c SDL-1.2.15-aros/src/audio/ahi/SDL_ahiaudio.c ---- SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/ahi/SDL_ahiaudio.c 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/ahi/SDL_ahiaudio.c SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.c +--- SDL-1.2.15-orig/src/audio/ahi/SDL_ahiaudio.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.c 2015-05-09 15:09:59.753739536 +0200 @@ -0,0 +1,528 @@ +/* + SDL - Simple DirectMedia Layer @@ -2075,9 +2075,9 @@ diff -ruN SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.c SDL-1.2.15-aros/src/audio/ahi/ + + SetTaskPri(task, 1); +} -diff -ruN SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.h SDL-1.2.15-aros/src/audio/ahi/SDL_ahiaudio.h ---- SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/ahi/SDL_ahiaudio.h 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/ahi/SDL_ahiaudio.h SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.h +--- SDL-1.2.15-orig/src/audio/ahi/SDL_ahiaudio.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.h 2015-05-09 15:09:59.753739536 +0200 @@ -0,0 +1,64 @@ +/* + SDL - Simple DirectMedia Layer @@ -2143,9 +2143,9 @@ diff -ruN SDL-1.2.15/src/audio/ahi/SDL_ahiaudio.h SDL-1.2.15-aros/src/audio/ahi/ +}; + +#endif /* _SDL_ahiaudio_h */ -diff -ruN SDL-1.2.15/src/audio/disk/SDL_diskaudio.c SDL-1.2.15-aros/src/audio/disk/SDL_diskaudio.c ---- SDL-1.2.15/src/audio/disk/SDL_diskaudio.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/disk/SDL_diskaudio.c 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/disk/SDL_diskaudio.c SDL-1.2.15/src/audio/disk/SDL_diskaudio.c +--- SDL-1.2.15-orig/src/audio/disk/SDL_diskaudio.c 2015-05-09 17:47:54.324774187 +0200 ++++ SDL-1.2.15/src/audio/disk/SDL_diskaudio.c 2015-05-09 15:09:59.754739534 +0200 @@ -21,6 +21,11 @@ This file written by Ryan C. Gordon (icculus@icculus.org) @@ -2266,9 +2266,9 @@ diff -ruN SDL-1.2.15/src/audio/disk/SDL_diskaudio.c SDL-1.2.15-aros/src/audio/di { const char *fname = DISKAUD_GetOutputFilename(); -diff -ruN SDL-1.2.15/src/audio/dummy/SDL_dummyaudio.c SDL-1.2.15-aros/src/audio/dummy/SDL_dummyaudio.c ---- SDL-1.2.15/src/audio/dummy/SDL_dummyaudio.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/dummy/SDL_dummyaudio.c 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/dummy/SDL_dummyaudio.c SDL-1.2.15/src/audio/dummy/SDL_dummyaudio.c +--- SDL-1.2.15-orig/src/audio/dummy/SDL_dummyaudio.c 2015-05-09 17:47:54.350774118 +0200 ++++ SDL-1.2.15/src/audio/dummy/SDL_dummyaudio.c 2015-05-09 15:09:59.754739534 +0200 @@ -21,6 +21,11 @@ This file written by Ryan C. Gordon (icculus@icculus.org) @@ -2386,9 +2386,9 @@ diff -ruN SDL-1.2.15/src/audio/dummy/SDL_dummyaudio.c SDL-1.2.15-aros/src/audio/ { float bytes_per_sec = 0.0f; -diff -ruN SDL-1.2.15/src/audio/SDL_audio.c SDL-1.2.15-aros/src/audio/SDL_audio.c ---- SDL-1.2.15/src/audio/SDL_audio.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/SDL_audio.c 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/SDL_audio.c SDL-1.2.15/src/audio/SDL_audio.c +--- SDL-1.2.15-orig/src/audio/SDL_audio.c 2015-05-09 17:47:54.352774113 +0200 ++++ SDL-1.2.15/src/audio/SDL_audio.c 2015-05-09 15:09:59.754739534 +0200 @@ -19,6 +19,12 @@ Sam Lantinga slouken@libsdl.org @@ -2888,9 +2888,9 @@ diff -ruN SDL-1.2.15/src/audio/SDL_audio.c SDL-1.2.15-aros/src/audio/SDL_audio.c +#endif } -diff -ruN SDL-1.2.15/src/audio/SDL_audio_c.h SDL-1.2.15-aros/src/audio/SDL_audio_c.h ---- SDL-1.2.15/src/audio/SDL_audio_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/SDL_audio_c.h 2014-08-23 18:00:57.016780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/SDL_audio_c.h SDL-1.2.15/src/audio/SDL_audio_c.h +--- SDL-1.2.15-orig/src/audio/SDL_audio_c.h 2015-05-09 17:47:54.324774187 +0200 ++++ SDL-1.2.15/src/audio/SDL_audio_c.h 2015-05-09 15:09:59.754739534 +0200 @@ -23,6 +23,8 @@ /* Functions and variables exported from SDL_audio.c for SDL_sysaudio.c */ @@ -2918,9 +2918,9 @@ diff -ruN SDL-1.2.15/src/audio/SDL_audio_c.h SDL-1.2.15-aros/src/audio/SDL_audio +#endif + -diff -ruN SDL-1.2.15/src/audio/SDL_audiocvt.c SDL-1.2.15-aros/src/audio/SDL_audiocvt.c ---- SDL-1.2.15/src/audio/SDL_audiocvt.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/SDL_audiocvt.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/SDL_audiocvt.c SDL-1.2.15/src/audio/SDL_audiocvt.c +--- SDL-1.2.15-orig/src/audio/SDL_audiocvt.c 2015-05-09 17:47:54.352774113 +0200 ++++ SDL-1.2.15/src/audio/SDL_audiocvt.c 2015-05-09 15:09:59.755739532 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -3459,9 +3459,9 @@ diff -ruN SDL-1.2.15/src/audio/SDL_audiocvt.c SDL-1.2.15-aros/src/audio/SDL_audi + AROS_LIBFUNC_EXIT +#endif } -diff -ruN SDL-1.2.15/src/audio/SDL_audiodev.c SDL-1.2.15-aros/src/audio/SDL_audiodev.c ---- SDL-1.2.15/src/audio/SDL_audiodev.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/SDL_audiodev.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/SDL_audiodev.c SDL-1.2.15/src/audio/SDL_audiodev.c +--- SDL-1.2.15-orig/src/audio/SDL_audiodev.c 2015-05-09 17:47:54.324774187 +0200 ++++ SDL-1.2.15/src/audio/SDL_audiodev.c 2015-05-09 15:09:59.755739532 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -3474,9 +3474,9 @@ diff -ruN SDL-1.2.15/src/audio/SDL_audiodev.c SDL-1.2.15-aros/src/audio/SDL_audi #include "SDL_config.h" /* Get the name of the audio device we use for output */ -diff -ruN SDL-1.2.15/src/audio/SDL_mixer.c SDL-1.2.15-aros/src/audio/SDL_mixer.c ---- SDL-1.2.15/src/audio/SDL_mixer.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/SDL_mixer.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/SDL_mixer.c SDL-1.2.15/src/audio/SDL_mixer.c +--- SDL-1.2.15-orig/src/audio/SDL_mixer.c 2015-05-09 17:47:54.352774113 +0200 ++++ SDL-1.2.15/src/audio/SDL_mixer.c 2015-05-09 15:09:59.756739531 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -3531,9 +3531,9 @@ diff -ruN SDL-1.2.15/src/audio/SDL_mixer.c SDL-1.2.15-aros/src/audio/SDL_mixer.c +#endif } -diff -ruN SDL-1.2.15/src/audio/SDL_mixer_m68k.c SDL-1.2.15-aros/src/audio/SDL_mixer_m68k.c ---- SDL-1.2.15/src/audio/SDL_mixer_m68k.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/SDL_mixer_m68k.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/SDL_mixer_m68k.c SDL-1.2.15/src/audio/SDL_mixer_m68k.c +--- SDL-1.2.15-orig/src/audio/SDL_mixer_m68k.c 2015-05-09 17:47:54.352774113 +0200 ++++ SDL-1.2.15/src/audio/SDL_mixer_m68k.c 2015-05-09 15:09:59.756739531 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -3546,9 +3546,9 @@ diff -ruN SDL-1.2.15/src/audio/SDL_mixer_m68k.c SDL-1.2.15-aros/src/audio/SDL_mi #include "SDL_config.h" /* -diff -ruN SDL-1.2.15/src/audio/SDL_mixer_MMX.c SDL-1.2.15-aros/src/audio/SDL_mixer_MMX.c ---- SDL-1.2.15/src/audio/SDL_mixer_MMX.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/SDL_mixer_MMX.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/SDL_mixer_MMX.c SDL-1.2.15/src/audio/SDL_mixer_MMX.c +--- SDL-1.2.15-orig/src/audio/SDL_mixer_MMX.c 2015-05-09 17:47:54.350774118 +0200 ++++ SDL-1.2.15/src/audio/SDL_mixer_MMX.c 2015-05-09 15:09:59.756739531 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -3561,9 +3561,9 @@ diff -ruN SDL-1.2.15/src/audio/SDL_mixer_MMX.c SDL-1.2.15-aros/src/audio/SDL_mix #include "SDL_config.h" /* -diff -ruN SDL-1.2.15/src/audio/SDL_sysaudio.h SDL-1.2.15-aros/src/audio/SDL_sysaudio.h ---- SDL-1.2.15/src/audio/SDL_sysaudio.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/SDL_sysaudio.h 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/SDL_sysaudio.h SDL-1.2.15/src/audio/SDL_sysaudio.h +--- SDL-1.2.15-orig/src/audio/SDL_sysaudio.h 2015-05-09 17:47:54.324774187 +0200 ++++ SDL-1.2.15/src/audio/SDL_sysaudio.h 2015-05-09 15:09:59.756739531 +0200 @@ -27,6 +27,10 @@ #include "SDL_mutex.h" #include "SDL_thread.h" @@ -3643,9 +3643,9 @@ diff -ruN SDL-1.2.15/src/audio/SDL_sysaudio.h SDL-1.2.15-aros/src/audio/SDL_sysa +#endif #endif /* _SDL_sysaudio_h */ -diff -ruN SDL-1.2.15/src/audio/SDL_wave.c SDL-1.2.15-aros/src/audio/SDL_wave.c ---- SDL-1.2.15/src/audio/SDL_wave.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/audio/SDL_wave.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/audio/SDL_wave.c SDL-1.2.15/src/audio/SDL_wave.c +--- SDL-1.2.15-orig/src/audio/SDL_wave.c 2015-05-09 17:47:54.352774113 +0200 ++++ SDL-1.2.15/src/audio/SDL_wave.c 2015-05-09 15:09:59.756739531 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -3774,9 +3774,9 @@ diff -ruN SDL-1.2.15/src/audio/SDL_wave.c SDL-1.2.15-aros/src/audio/SDL_wave.c { chunk->magic = SDL_ReadLE32(src); chunk->length = SDL_ReadLE32(src); -diff -ruN SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.c SDL-1.2.15-aros/src/cdrom/aros/SDL_syscdrom.c ---- SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/cdrom/aros/SDL_syscdrom.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/cdrom/aros/SDL_syscdrom.c SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.c +--- SDL-1.2.15-orig/src/cdrom/aros/SDL_syscdrom.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.c 2015-05-09 15:09:59.757739529 +0200 @@ -0,0 +1,635 @@ +/* + SDL - Simple DirectMedia Layer @@ -4413,9 +4413,9 @@ diff -ruN SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.c SDL-1.2.15-aros/src/cdrom/aro +{ + D(bug("CDRom : SDL_SYS_CDQuit\n")); +} -diff -ruN SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.h SDL-1.2.15-aros/src/cdrom/aros/SDL_syscdrom.h ---- SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/cdrom/aros/SDL_syscdrom.h 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/cdrom/aros/SDL_syscdrom.h SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.h +--- SDL-1.2.15-orig/src/cdrom/aros/SDL_syscdrom.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.h 2015-05-09 15:09:59.757739529 +0200 @@ -0,0 +1,107 @@ +/* + SDL - Simple DirectMedia Layer @@ -4524,9 +4524,9 @@ diff -ruN SDL-1.2.15/src/cdrom/aros/SDL_syscdrom.h SDL-1.2.15-aros/src/cdrom/aro +#define SDL_numcds SDLBase->SDL_numcds +#endif +#endif -diff -ruN SDL-1.2.15/src/cdrom/SDL_cdrom.c SDL-1.2.15-aros/src/cdrom/SDL_cdrom.c ---- SDL-1.2.15/src/cdrom/SDL_cdrom.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/cdrom/SDL_cdrom.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/cdrom/SDL_cdrom.c SDL-1.2.15/src/cdrom/SDL_cdrom.c +--- SDL-1.2.15-orig/src/cdrom/SDL_cdrom.c 2015-05-09 17:47:54.311774220 +0200 ++++ SDL-1.2.15/src/cdrom/SDL_cdrom.c 2015-05-09 15:09:59.757739529 +0200 @@ -19,6 +19,12 @@ Sam Lantinga slouken@libsdl.org @@ -4951,9 +4951,9 @@ diff -ruN SDL-1.2.15/src/cdrom/SDL_cdrom.c SDL-1.2.15-aros/src/cdrom/SDL_cdrom.c { SDL_SYS_CDQuit(); SDL_cdinitted = 0; -diff -ruN SDL-1.2.15/src/cdrom/SDL_syscdrom.h SDL-1.2.15-aros/src/cdrom/SDL_syscdrom.h ---- SDL-1.2.15/src/cdrom/SDL_syscdrom.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/cdrom/SDL_syscdrom.h 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/cdrom/SDL_syscdrom.h SDL-1.2.15/src/cdrom/SDL_syscdrom.h +--- SDL-1.2.15-orig/src/cdrom/SDL_syscdrom.h 2015-05-09 17:47:54.311774220 +0200 ++++ SDL-1.2.15/src/cdrom/SDL_syscdrom.h 2015-05-09 15:09:59.758739527 +0200 @@ -21,12 +21,17 @@ */ #include "SDL_config.h" @@ -5009,9 +5009,9 @@ diff -ruN SDL-1.2.15/src/cdrom/SDL_syscdrom.h SDL-1.2.15-aros/src/cdrom/SDL_sysc +#define SDL_numcds SDLBase->SDL_numcds +#endif -diff -ruN SDL-1.2.15/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.15-aros/src/cpuinfo/SDL_cpuinfo.c ---- SDL-1.2.15/src/cpuinfo/SDL_cpuinfo.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/cpuinfo/SDL_cpuinfo.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.15/src/cpuinfo/SDL_cpuinfo.c +--- SDL-1.2.15-orig/src/cpuinfo/SDL_cpuinfo.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/cpuinfo/SDL_cpuinfo.c 2015-05-09 15:09:59.758739527 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -5184,9 +5184,9 @@ diff -ruN SDL-1.2.15/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.15-aros/src/cpuinfo/SDL_c } #ifdef TEST_MAIN -diff -ruN SDL-1.2.15/src/events/SDL_active.c SDL-1.2.15-aros/src/events/SDL_active.c ---- SDL-1.2.15/src/events/SDL_active.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/events/SDL_active.c 2014-08-23 18:00:57.020780027 +0200 +diff -Naur SDL-1.2.15-orig/src/events/SDL_active.c SDL-1.2.15/src/events/SDL_active.c +--- SDL-1.2.15-orig/src/events/SDL_active.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/events/SDL_active.c 2015-05-09 15:09:59.758739527 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -5255,9 +5255,9 @@ diff -ruN SDL-1.2.15/src/events/SDL_active.c SDL-1.2.15-aros/src/events/SDL_acti { int posted; Uint8 new_state; -diff -ruN SDL-1.2.15/src/events/SDL_events.c SDL-1.2.15-aros/src/events/SDL_events.c ---- SDL-1.2.15/src/events/SDL_events.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/events/SDL_events.c 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/events/SDL_events.c SDL-1.2.15/src/events/SDL_events.c +--- SDL-1.2.15-orig/src/events/SDL_events.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/events/SDL_events.c 2015-05-09 15:09:59.758739527 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -5641,9 +5641,9 @@ diff -ruN SDL-1.2.15/src/events/SDL_events.c SDL-1.2.15-aros/src/events/SDL_even { int posted; -diff -ruN SDL-1.2.15/src/events/SDL_events_c.h SDL-1.2.15-aros/src/events/SDL_events_c.h ---- SDL-1.2.15/src/events/SDL_events_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/events/SDL_events_c.h 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/events/SDL_events_c.h SDL-1.2.15/src/events/SDL_events_c.h +--- SDL-1.2.15-orig/src/events/SDL_events_c.h 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/events/SDL_events_c.h 2015-05-09 15:09:59.759739525 +0200 @@ -24,6 +24,7 @@ /* Useful functions and variables from SDL_events.c */ #include "SDL_events.h" @@ -5728,9 +5728,9 @@ diff -ruN SDL-1.2.15/src/events/SDL_events_c.h SDL-1.2.15-aros/src/events/SDL_ev #define DEFAULT_UNICODE_TRANSLATION 0 /* Default off because of overhead */ #endif -extern int SDL_TranslateUNICODE; -diff -ruN SDL-1.2.15/src/events/SDL_expose.c SDL-1.2.15-aros/src/events/SDL_expose.c ---- SDL-1.2.15/src/events/SDL_expose.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/events/SDL_expose.c 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/events/SDL_expose.c SDL-1.2.15/src/events/SDL_expose.c +--- SDL-1.2.15-orig/src/events/SDL_expose.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/events/SDL_expose.c 2015-05-09 15:09:59.759739525 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -5755,9 +5755,9 @@ diff -ruN SDL-1.2.15/src/events/SDL_expose.c SDL-1.2.15-aros/src/events/SDL_expo { int posted; SDL_Event events[32]; -diff -ruN SDL-1.2.15/src/events/SDL_keyboard.c SDL-1.2.15-aros/src/events/SDL_keyboard.c ---- SDL-1.2.15/src/events/SDL_keyboard.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/events/SDL_keyboard.c 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/events/SDL_keyboard.c SDL-1.2.15/src/events/SDL_keyboard.c +--- SDL-1.2.15-orig/src/events/SDL_keyboard.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/events/SDL_keyboard.c 2015-05-09 15:09:59.759739525 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -5982,9 +5982,9 @@ diff -ruN SDL-1.2.15/src/events/SDL_keyboard.c SDL-1.2.15-aros/src/events/SDL_ke } void SDL_GetKeyRepeat(int *delay, int *interval) -diff -ruN SDL-1.2.15/src/events/SDL_mouse.c SDL-1.2.15-aros/src/events/SDL_mouse.c ---- SDL-1.2.15/src/events/SDL_mouse.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/events/SDL_mouse.c 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/events/SDL_mouse.c SDL-1.2.15/src/events/SDL_mouse.c +--- SDL-1.2.15-orig/src/events/SDL_mouse.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/events/SDL_mouse.c 2015-05-09 15:09:59.759739525 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -6146,9 +6146,9 @@ diff -ruN SDL-1.2.15/src/events/SDL_mouse.c SDL-1.2.15-aros/src/events/SDL_mouse { SDL_Event event; int posted; -diff -ruN SDL-1.2.15/src/events/SDL_quit.c SDL-1.2.15-aros/src/events/SDL_quit.c ---- SDL-1.2.15/src/events/SDL_quit.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/events/SDL_quit.c 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/events/SDL_quit.c SDL-1.2.15/src/events/SDL_quit.c +--- SDL-1.2.15-orig/src/events/SDL_quit.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/events/SDL_quit.c 2015-05-09 15:09:59.759739525 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -6206,9 +6206,9 @@ diff -ruN SDL-1.2.15/src/events/SDL_quit.c SDL-1.2.15-aros/src/events/SDL_quit.c { int posted; -diff -ruN SDL-1.2.15/src/events/SDL_resize.c SDL-1.2.15-aros/src/events/SDL_resize.c ---- SDL-1.2.15/src/events/SDL_resize.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/events/SDL_resize.c 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/events/SDL_resize.c SDL-1.2.15/src/events/SDL_resize.c +--- SDL-1.2.15-orig/src/events/SDL_resize.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/events/SDL_resize.c 2015-05-09 15:09:59.759739525 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -6247,9 +6247,9 @@ diff -ruN SDL-1.2.15/src/events/SDL_resize.c SDL-1.2.15-aros/src/events/SDL_resi { int posted; SDL_Event events[32]; -diff -ruN SDL-1.2.15/src/file/SDL_rwops.c SDL-1.2.15-aros/src/file/SDL_rwops.c ---- SDL-1.2.15/src/file/SDL_rwops.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/file/SDL_rwops.c 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/file/SDL_rwops.c SDL-1.2.15/src/file/SDL_rwops.c +--- SDL-1.2.15-orig/src/file/SDL_rwops.c 2015-05-09 17:47:54.353774110 +0200 ++++ SDL-1.2.15/src/file/SDL_rwops.c 2015-05-09 15:09:59.760739523 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -6707,9 +6707,9 @@ diff -ruN SDL-1.2.15/src/file/SDL_rwops.c SDL-1.2.15-aros/src/file/SDL_rwops.c + AROS_LIBFUNC_EXIT +#endif } -diff -ruN SDL-1.2.15/src/joystick/aros/SDL_sysjoystick.c SDL-1.2.15-aros/src/joystick/aros/SDL_sysjoystick.c ---- SDL-1.2.15/src/joystick/aros/SDL_sysjoystick.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/joystick/aros/SDL_sysjoystick.c 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/joystick/aros/SDL_sysjoystick.c SDL-1.2.15/src/joystick/aros/SDL_sysjoystick.c +--- SDL-1.2.15-orig/src/joystick/aros/SDL_sysjoystick.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/joystick/aros/SDL_sysjoystick.c 2015-05-09 15:09:59.760739523 +0200 @@ -0,0 +1,506 @@ +/* + SDL - Simple DirectMedia Layer @@ -7217,9 +7217,9 @@ diff -ruN SDL-1.2.15/src/joystick/aros/SDL_sysjoystick.c SDL-1.2.15-aros/src/joy + return; +} + -diff -ruN SDL-1.2.15/src/joystick/SDL_joystick.c SDL-1.2.15-aros/src/joystick/SDL_joystick.c ---- SDL-1.2.15/src/joystick/SDL_joystick.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/joystick/SDL_joystick.c 2014-08-23 18:00:57.024780027 +0200 +diff -Naur SDL-1.2.15-orig/src/joystick/SDL_joystick.c SDL-1.2.15/src/joystick/SDL_joystick.c +--- SDL-1.2.15-orig/src/joystick/SDL_joystick.c 2015-05-09 17:47:54.323774189 +0200 ++++ SDL-1.2.15/src/joystick/SDL_joystick.c 2015-05-09 15:09:59.760739523 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -7694,9 +7694,9 @@ diff -ruN SDL-1.2.15/src/joystick/SDL_joystick.c SDL-1.2.15-aros/src/joystick/SD + AROS_LIBFUNC_EXIT +#endif } -diff -ruN SDL-1.2.15/src/joystick/SDL_joystick_c.h SDL-1.2.15-aros/src/joystick/SDL_joystick_c.h ---- SDL-1.2.15/src/joystick/SDL_joystick_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/joystick/SDL_joystick_c.h 2014-08-23 18:00:57.028780027 +0200 +diff -Naur SDL-1.2.15-orig/src/joystick/SDL_joystick_c.h SDL-1.2.15/src/joystick/SDL_joystick_c.h +--- SDL-1.2.15-orig/src/joystick/SDL_joystick_c.h 2015-05-09 17:47:54.312774218 +0200 ++++ SDL-1.2.15/src/joystick/SDL_joystick_c.h 2015-05-09 15:09:59.760739523 +0200 @@ -28,6 +28,7 @@ extern Uint8 SDL_numjoysticks; @@ -7725,9 +7725,9 @@ diff -ruN SDL-1.2.15/src/joystick/SDL_joystick_c.h SDL-1.2.15-aros/src/joystick/ +#define SDL_PrivateJoystickHat(joystick, hat, value) SDL_PrivateJoystickHatI(joystick, hat, value, SDLBase) +#define SDL_PrivateJoystickButton(joystick, button, state) SDL_PrivateJoystickButtonI(joystick, button, state, SDLBase) +#endif -diff -ruN SDL-1.2.15/src/joystick/SDL_sysjoystick.h SDL-1.2.15-aros/src/joystick/SDL_sysjoystick.h ---- SDL-1.2.15/src/joystick/SDL_sysjoystick.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/joystick/SDL_sysjoystick.h 2014-08-23 18:00:57.028780027 +0200 +diff -Naur SDL-1.2.15-orig/src/joystick/SDL_sysjoystick.h SDL-1.2.15/src/joystick/SDL_sysjoystick.h +--- SDL-1.2.15-orig/src/joystick/SDL_sysjoystick.h 2015-05-09 17:47:54.312774218 +0200 ++++ SDL-1.2.15/src/joystick/SDL_sysjoystick.h 2015-05-09 15:09:59.761739521 +0200 @@ -55,28 +55,39 @@ * This function should return the number of available joysticks, or -1 * on an unrecoverable fatal error. @@ -7774,9 +7774,9 @@ diff -ruN SDL-1.2.15/src/joystick/SDL_sysjoystick.h SDL-1.2.15-aros/src/joystick +#define SDL_SYS_JoystickClose(joystick) SDL_SYS_JoystickCloseI(joystick, SDLBase) +#define SDL_SYS_JoystickQuit() SDL_SYS_JoystickQuitI(SDLBase) +#endif -diff -ruN SDL-1.2.15/src/loadso/dummy/SDL_sysloadso.c SDL-1.2.15-aros/src/loadso/dummy/SDL_sysloadso.c ---- SDL-1.2.15/src/loadso/dummy/SDL_sysloadso.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/loadso/dummy/SDL_sysloadso.c 2014-08-23 18:00:57.028780027 +0200 +diff -Naur SDL-1.2.15-orig/src/loadso/dummy/SDL_sysloadso.c SDL-1.2.15/src/loadso/dummy/SDL_sysloadso.c +--- SDL-1.2.15-orig/src/loadso/dummy/SDL_sysloadso.c 2015-05-09 17:47:54.311774220 +0200 ++++ SDL-1.2.15/src/loadso/dummy/SDL_sysloadso.c 2015-05-09 15:09:59.761739521 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -7823,9 +7823,9 @@ diff -ruN SDL-1.2.15/src/loadso/dummy/SDL_sysloadso.c SDL-1.2.15-aros/src/loadso { /* no-op. */ } -diff -ruN SDL-1.2.15/src/main/aros/mydebug.h SDL-1.2.15-aros/src/main/aros/mydebug.h ---- SDL-1.2.15/src/main/aros/mydebug.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/main/aros/mydebug.h 2014-08-23 18:00:57.028780027 +0200 +diff -Naur SDL-1.2.15-orig/src/main/aros/mydebug.h SDL-1.2.15/src/main/aros/mydebug.h +--- SDL-1.2.15-orig/src/main/aros/mydebug.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/main/aros/mydebug.h 2015-05-09 15:09:59.761739521 +0200 @@ -0,0 +1,8 @@ +#ifndef MYDEBUG +#define MYDEBUG @@ -7835,9 +7835,9 @@ diff -ruN SDL-1.2.15/src/main/aros/mydebug.h SDL-1.2.15-aros/src/main/aros/mydeb +#define MAKE_HIT() {char *a=NULL,b;b=*a;} + +#endif -diff -ruN SDL-1.2.15/src/SDL.c SDL-1.2.15-aros/src/SDL.c ---- SDL-1.2.15/src/SDL.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/SDL.c 2014-08-23 18:00:57.028780027 +0200 +diff -Naur SDL-1.2.15-orig/src/SDL.c SDL-1.2.15/src/SDL.c +--- SDL-1.2.15-orig/src/SDL.c 2015-05-09 17:47:54.323774189 +0200 ++++ SDL-1.2.15/src/SDL.c 2015-05-09 15:09:59.761739521 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -8035,9 +8035,9 @@ diff -ruN SDL-1.2.15/src/SDL.c SDL-1.2.15-aros/src/SDL.c } #if defined(__OS2__) -diff -ruN SDL-1.2.15/src/SDL_error.c SDL-1.2.15-aros/src/SDL_error.c ---- SDL-1.2.15/src/SDL_error.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/SDL_error.c 2014-08-23 18:00:57.028780027 +0200 +diff -Naur SDL-1.2.15-orig/src/SDL_error.c SDL-1.2.15/src/SDL_error.c +--- SDL-1.2.15-orig/src/SDL_error.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/SDL_error.c 2015-05-09 15:09:59.761739521 +0200 @@ -19,6 +19,13 @@ Sam Lantinga slouken@libsdl.org @@ -8222,9 +8222,9 @@ diff -ruN SDL-1.2.15/src/SDL_error.c SDL-1.2.15-aros/src/SDL_error.c } #ifdef TEST_ERROR -diff -ruN SDL-1.2.15/src/SDL_fatal.c SDL-1.2.15-aros/src/SDL_fatal.c ---- SDL-1.2.15/src/SDL_fatal.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/SDL_fatal.c 2014-08-23 18:00:57.028780027 +0200 +diff -Naur SDL-1.2.15-orig/src/SDL_fatal.c SDL-1.2.15/src/SDL_fatal.c +--- SDL-1.2.15-orig/src/SDL_fatal.c 2015-05-09 17:47:54.323774189 +0200 ++++ SDL-1.2.15/src/SDL_fatal.c 2015-05-09 15:09:59.761739521 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -8249,9 +8249,9 @@ diff -ruN SDL-1.2.15/src/SDL_fatal.c SDL-1.2.15-aros/src/SDL_fatal.c raise(sig); } -diff -ruN SDL-1.2.15/src/stdlib/SDL_getenv.c SDL-1.2.15-aros/src/stdlib/SDL_getenv.c ---- SDL-1.2.15/src/stdlib/SDL_getenv.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/stdlib/SDL_getenv.c 2014-08-23 18:00:57.028780027 +0200 +diff -Naur SDL-1.2.15-orig/src/stdlib/SDL_getenv.c SDL-1.2.15/src/stdlib/SDL_getenv.c +--- SDL-1.2.15-orig/src/stdlib/SDL_getenv.c 2015-05-09 17:47:54.353774110 +0200 ++++ SDL-1.2.15/src/stdlib/SDL_getenv.c 2015-05-09 15:09:59.762739519 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -8264,9 +8264,9 @@ diff -ruN SDL-1.2.15/src/stdlib/SDL_getenv.c SDL-1.2.15-aros/src/stdlib/SDL_gete #include "SDL_config.h" #include "SDL_stdinc.h" -diff -ruN SDL-1.2.15/src/stdlib/SDL_iconv.c SDL-1.2.15-aros/src/stdlib/SDL_iconv.c ---- SDL-1.2.15/src/stdlib/SDL_iconv.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/stdlib/SDL_iconv.c 2014-08-23 18:00:57.028780027 +0200 +diff -Naur SDL-1.2.15-orig/src/stdlib/SDL_iconv.c SDL-1.2.15/src/stdlib/SDL_iconv.c +--- SDL-1.2.15-orig/src/stdlib/SDL_iconv.c 2015-05-09 17:47:54.353774110 +0200 ++++ SDL-1.2.15/src/stdlib/SDL_iconv.c 2015-05-09 15:09:59.762739519 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -8323,9 +8323,9 @@ diff -ruN SDL-1.2.15/src/stdlib/SDL_iconv.c SDL-1.2.15-aros/src/stdlib/SDL_iconv + AROS_LIBFUNC_EXIT +#endif } -diff -ruN SDL-1.2.15/src/stdlib/SDL_malloc.c SDL-1.2.15-aros/src/stdlib/SDL_malloc.c ---- SDL-1.2.15/src/stdlib/SDL_malloc.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/stdlib/SDL_malloc.c 2014-08-23 18:00:57.032780027 +0200 +diff -Naur SDL-1.2.15-orig/src/stdlib/SDL_malloc.c SDL-1.2.15/src/stdlib/SDL_malloc.c +--- SDL-1.2.15-orig/src/stdlib/SDL_malloc.c 2015-05-09 17:47:54.353774110 +0200 ++++ SDL-1.2.15/src/stdlib/SDL_malloc.c 2015-05-09 15:09:59.762739519 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -8338,9 +8338,9 @@ diff -ruN SDL-1.2.15/src/stdlib/SDL_malloc.c SDL-1.2.15-aros/src/stdlib/SDL_mall #include "SDL_config.h" /* This file contains portable memory management functions for SDL */ -diff -ruN SDL-1.2.15/src/stdlib/SDL_qsort.c SDL-1.2.15-aros/src/stdlib/SDL_qsort.c ---- SDL-1.2.15/src/stdlib/SDL_qsort.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/stdlib/SDL_qsort.c 2014-08-23 18:00:57.032780027 +0200 +diff -Naur SDL-1.2.15-orig/src/stdlib/SDL_qsort.c SDL-1.2.15/src/stdlib/SDL_qsort.c +--- SDL-1.2.15-orig/src/stdlib/SDL_qsort.c 2015-05-09 17:47:54.353774110 +0200 ++++ SDL-1.2.15/src/stdlib/SDL_qsort.c 2015-05-09 15:09:59.763739517 +0200 @@ -41,6 +41,11 @@ * * Gareth McCaughan Peterhouse Cambridge 1998 @@ -8353,9 +8353,9 @@ diff -ruN SDL-1.2.15/src/stdlib/SDL_qsort.c SDL-1.2.15-aros/src/stdlib/SDL_qsort #include "SDL_config.h" /* -diff -ruN SDL-1.2.15/src/stdlib/SDL_stdlib.c SDL-1.2.15-aros/src/stdlib/SDL_stdlib.c ---- SDL-1.2.15/src/stdlib/SDL_stdlib.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/stdlib/SDL_stdlib.c 2014-08-23 18:00:57.032780027 +0200 +diff -Naur SDL-1.2.15-orig/src/stdlib/SDL_stdlib.c SDL-1.2.15/src/stdlib/SDL_stdlib.c +--- SDL-1.2.15-orig/src/stdlib/SDL_stdlib.c 2015-05-09 17:47:54.353774110 +0200 ++++ SDL-1.2.15/src/stdlib/SDL_stdlib.c 2015-05-09 15:09:59.763739517 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -8368,9 +8368,9 @@ diff -ruN SDL-1.2.15/src/stdlib/SDL_stdlib.c SDL-1.2.15-aros/src/stdlib/SDL_stdl #include "SDL_config.h" /* This file contains portable stdlib functions for SDL */ -diff -ruN SDL-1.2.15/src/stdlib/SDL_string.c SDL-1.2.15-aros/src/stdlib/SDL_string.c ---- SDL-1.2.15/src/stdlib/SDL_string.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/stdlib/SDL_string.c 2014-08-23 18:00:57.032780027 +0200 +diff -Naur SDL-1.2.15-orig/src/stdlib/SDL_string.c SDL-1.2.15/src/stdlib/SDL_string.c +--- SDL-1.2.15-orig/src/stdlib/SDL_string.c 2015-05-09 17:47:54.353774110 +0200 ++++ SDL-1.2.15/src/stdlib/SDL_string.c 2015-05-09 15:09:59.763739517 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -8383,9 +8383,9 @@ diff -ruN SDL-1.2.15/src/stdlib/SDL_string.c SDL-1.2.15-aros/src/stdlib/SDL_stri #include "SDL_config.h" /* This file contains portable string manipulation functions for SDL */ -diff -ruN SDL-1.2.15/src/thread/aros/SDL_syscond.c SDL-1.2.15-aros/src/thread/aros/SDL_syscond.c ---- SDL-1.2.15/src/thread/aros/SDL_syscond.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/thread/aros/SDL_syscond.c 2014-08-23 18:00:57.032780027 +0200 +diff -Naur SDL-1.2.15-orig/src/thread/aros/SDL_syscond.c SDL-1.2.15/src/thread/aros/SDL_syscond.c +--- SDL-1.2.15-orig/src/thread/aros/SDL_syscond.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/thread/aros/SDL_syscond.c 2015-05-09 15:09:59.763739517 +0200 @@ -0,0 +1,297 @@ +/* + SDL - Simple DirectMedia Layer @@ -8684,9 +8684,9 @@ diff -ruN SDL-1.2.15/src/thread/aros/SDL_syscond.c SDL-1.2.15-aros/src/thread/ar + AROS_LIBFUNC_EXIT +#endif +} -diff -ruN SDL-1.2.15/src/thread/aros/SDL_sysmutex.c SDL-1.2.15-aros/src/thread/aros/SDL_sysmutex.c ---- SDL-1.2.15/src/thread/aros/SDL_sysmutex.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/thread/aros/SDL_sysmutex.c 2014-08-23 18:00:57.032780027 +0200 +diff -Naur SDL-1.2.15-orig/src/thread/aros/SDL_sysmutex.c SDL-1.2.15/src/thread/aros/SDL_sysmutex.c +--- SDL-1.2.15-orig/src/thread/aros/SDL_sysmutex.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/thread/aros/SDL_sysmutex.c 2015-05-09 15:09:59.763739517 +0200 @@ -0,0 +1,179 @@ +/* + SDL - Simple DirectMedia Layer @@ -8867,9 +8867,9 @@ diff -ruN SDL-1.2.15/src/thread/aros/SDL_sysmutex.c SDL-1.2.15-aros/src/thread/a + AROS_LIBFUNC_EXIT +#endif +} -diff -ruN SDL-1.2.15/src/thread/aros/SDL_syssem.c SDL-1.2.15-aros/src/thread/aros/SDL_syssem.c ---- SDL-1.2.15/src/thread/aros/SDL_syssem.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/thread/aros/SDL_syssem.c 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/thread/aros/SDL_syssem.c SDL-1.2.15/src/thread/aros/SDL_syssem.c +--- SDL-1.2.15-orig/src/thread/aros/SDL_syssem.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/thread/aros/SDL_syssem.c 2015-05-09 15:09:59.764739515 +0200 @@ -0,0 +1,658 @@ +/* + SDL - Simple DirectMedia Layer @@ -9529,9 +9529,9 @@ diff -ruN SDL-1.2.15/src/thread/aros/SDL_syssem.c SDL-1.2.15-aros/src/thread/aro +#endif +} + -diff -ruN SDL-1.2.15/src/thread/aros/SDL_systhread.c SDL-1.2.15-aros/src/thread/aros/SDL_systhread.c ---- SDL-1.2.15/src/thread/aros/SDL_systhread.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/thread/aros/SDL_systhread.c 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/thread/aros/SDL_systhread.c SDL-1.2.15/src/thread/aros/SDL_systhread.c +--- SDL-1.2.15-orig/src/thread/aros/SDL_systhread.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/thread/aros/SDL_systhread.c 2015-05-09 15:09:59.764739515 +0200 @@ -0,0 +1,173 @@ +/* + SDL - Simple DirectMedia Layer @@ -9706,9 +9706,9 @@ diff -ruN SDL-1.2.15/src/thread/aros/SDL_systhread.c SDL-1.2.15-aros/src/thread/ +{ + Signal((struct Task *)thread->handle,SIGBREAKF_CTRL_C); +} -diff -ruN SDL-1.2.15/src/thread/aros/SDL_systhread_c.h SDL-1.2.15-aros/src/thread/aros/SDL_systhread_c.h ---- SDL-1.2.15/src/thread/aros/SDL_systhread_c.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/thread/aros/SDL_systhread_c.h 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/thread/aros/SDL_systhread_c.h SDL-1.2.15/src/thread/aros/SDL_systhread_c.h +--- SDL-1.2.15-orig/src/thread/aros/SDL_systhread_c.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/thread/aros/SDL_systhread_c.h 2015-05-09 15:09:59.764739515 +0200 @@ -0,0 +1,36 @@ +/* + SDL - Simple DirectMedia Layer @@ -9746,9 +9746,9 @@ diff -ruN SDL-1.2.15/src/thread/aros/SDL_systhread_c.h SDL-1.2.15-aros/src/threa + +#define SYS_ThreadHandle struct Task * + -diff -ruN SDL-1.2.15/src/thread/aros/SDL_thread.c SDL-1.2.15-aros/src/thread/aros/SDL_thread.c ---- SDL-1.2.15/src/thread/aros/SDL_thread.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/thread/aros/SDL_thread.c 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/thread/aros/SDL_thread.c SDL-1.2.15/src/thread/aros/SDL_thread.c +--- SDL-1.2.15-orig/src/thread/aros/SDL_thread.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/thread/aros/SDL_thread.c 2015-05-09 15:09:59.764739515 +0200 @@ -0,0 +1,408 @@ +/* + SDL - Simple DirectMedia Layer @@ -10158,9 +10158,9 @@ diff -ruN SDL-1.2.15/src/thread/aros/SDL_thread.c SDL-1.2.15-aros/src/thread/aro +#endif +} + -diff -ruN SDL-1.2.15/src/thread/SDL_systhread.h SDL-1.2.15-aros/src/thread/SDL_systhread.h ---- SDL-1.2.15/src/thread/SDL_systhread.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/thread/SDL_systhread.h 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/thread/SDL_systhread.h SDL-1.2.15/src/thread/SDL_systhread.h +--- SDL-1.2.15-orig/src/thread/SDL_systhread.h 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/thread/SDL_systhread.h 2015-05-09 15:09:59.764739515 +0200 @@ -32,6 +32,7 @@ saves a system-dependent thread id in thread->id, and returns 0 on success. @@ -10187,9 +10187,9 @@ diff -ruN SDL-1.2.15/src/thread/SDL_systhread.h SDL-1.2.15-aros/src/thread/SDL_s +#define SDL_SYS_KillThread(thread) SDL_SYS_KillThreadI(thread, SDLBase) +#endif #endif /* _SDL_systhread_h */ -diff -ruN SDL-1.2.15/src/thread/SDL_thread.c SDL-1.2.15-aros/src/thread/SDL_thread.c ---- SDL-1.2.15/src/thread/SDL_thread.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/thread/SDL_thread.c 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/thread/SDL_thread.c SDL-1.2.15/src/thread/SDL_thread.c +--- SDL-1.2.15-orig/src/thread/SDL_thread.c 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/thread/SDL_thread.c 2015-05-09 15:09:59.764739515 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -10276,9 +10276,9 @@ diff -ruN SDL-1.2.15/src/thread/SDL_thread.c SDL-1.2.15-aros/src/thread/SDL_thre /* Routine to get the thread-specific error variable */ SDL_error *SDL_GetErrBuf(void) { -diff -ruN SDL-1.2.15/src/thread/SDL_thread_c.h SDL-1.2.15-aros/src/thread/SDL_thread_c.h ---- SDL-1.2.15/src/thread/SDL_thread_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/thread/SDL_thread_c.h 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/thread/SDL_thread_c.h SDL-1.2.15/src/thread/SDL_thread_c.h +--- SDL-1.2.15-orig/src/thread/SDL_thread_c.h 2015-05-09 17:47:54.280774303 +0200 ++++ SDL-1.2.15/src/thread/SDL_thread_c.h 2015-05-09 15:09:59.765739514 +0200 @@ -43,6 +43,8 @@ #include "win32/SDL_systhread_c.h" #elif SDL_THREAD_SYMBIAN @@ -10302,10 +10302,10 @@ diff -ruN SDL-1.2.15/src/thread/SDL_thread_c.h SDL-1.2.15-aros/src/thread/SDL_th extern void SDL_RunThread(void *data); - #endif /* _SDL_thread_c_h */ -diff -ruN SDL-1.2.15/src/timer/aros/SDL_systimer.c SDL-1.2.15-aros/src/timer/aros/SDL_systimer.c ---- SDL-1.2.15/src/timer/aros/SDL_systimer.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/timer/aros/SDL_systimer.c 2014-08-23 18:00:57.036780027 +0200 -@@ -0,0 +1,333 @@ +diff -Naur SDL-1.2.15-orig/src/timer/aros/SDL_systimer.c SDL-1.2.15/src/timer/aros/SDL_systimer.c +--- SDL-1.2.15-orig/src/timer/aros/SDL_systimer.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/timer/aros/SDL_systimer.c 2015-05-09 17:41:01.929187319 +0200 +@@ -0,0 +1,337 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga @@ -10638,10 +10638,14 @@ diff -ruN SDL-1.2.15/src/timer/aros/SDL_systimer.c SDL-1.2.15-aros/src/timer/aro + return; +} + ++#if defined(PROTO_SDL_H) ++ADD2CLOSELIB(close_timerI, -5); ++#endif ++ +#endif /* SDL_TIMER_AROS */ -diff -ruN SDL-1.2.15/src/timer/SDL_systimer.h SDL-1.2.15-aros/src/timer/SDL_systimer.h ---- SDL-1.2.15/src/timer/SDL_systimer.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/timer/SDL_systimer.h 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/timer/SDL_systimer.h SDL-1.2.15/src/timer/SDL_systimer.h +--- SDL-1.2.15-orig/src/timer/SDL_systimer.h 2015-05-09 17:47:54.323774189 +0200 ++++ SDL-1.2.15/src/timer/SDL_systimer.h 2015-05-09 15:09:59.765739514 +0200 @@ -26,7 +26,7 @@ #include "SDL_timer.h" #include "SDL_timer_c.h" @@ -10667,9 +10671,9 @@ diff -ruN SDL-1.2.15/src/timer/SDL_systimer.h SDL-1.2.15-aros/src/timer/SDL_syst +#define SDL_SYS_StopTimer() SDL_SYS_StopTimerI(SDLBase) +#endif \ No newline at end of file -diff -ruN SDL-1.2.15/src/timer/SDL_timer.c SDL-1.2.15-aros/src/timer/SDL_timer.c ---- SDL-1.2.15/src/timer/SDL_timer.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/timer/SDL_timer.c 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/timer/SDL_timer.c SDL-1.2.15/src/timer/SDL_timer.c +--- SDL-1.2.15-orig/src/timer/SDL_timer.c 2015-05-09 17:47:54.323774189 +0200 ++++ SDL-1.2.15/src/timer/SDL_timer.c 2015-05-09 15:09:59.765739514 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -10862,9 +10866,9 @@ diff -ruN SDL-1.2.15/src/timer/SDL_timer.c SDL-1.2.15-aros/src/timer/SDL_timer.c + AROS_LIBFUNC_EXIT +#endif } -diff -ruN SDL-1.2.15/src/timer/SDL_timer_c.h SDL-1.2.15-aros/src/timer/SDL_timer_c.h ---- SDL-1.2.15/src/timer/SDL_timer_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/timer/SDL_timer_c.h 2014-08-23 18:00:57.036780027 +0200 +diff -Naur SDL-1.2.15-orig/src/timer/SDL_timer_c.h SDL-1.2.15/src/timer/SDL_timer_c.h +--- SDL-1.2.15-orig/src/timer/SDL_timer_c.h 2015-05-09 17:47:54.323774189 +0200 ++++ SDL-1.2.15/src/timer/SDL_timer_c.h 2015-05-09 15:09:59.765739514 +0200 @@ -27,6 +27,7 @@ #define ROUND_RESOLUTION(X) \ (((X+TIMER_RESOLUTION-1)/TIMER_RESOLUTION)*TIMER_RESOLUTION) @@ -10895,9 +10899,9 @@ diff -ruN SDL-1.2.15/src/timer/SDL_timer_c.h SDL-1.2.15-aros/src/timer/SDL_timer +#define SDL_alarm_callback SDLBase->SDL_alarm_callback +#endif \ No newline at end of file -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxaccel.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxaccel.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxaccel.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxaccel.c 2014-08-23 18:00:57.040780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxaccel.c SDL-1.2.15/src/video/cgx/SDL_cgxaccel.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxaccel.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxaccel.c 2015-05-09 15:09:59.766739512 +0200 @@ -0,0 +1,701 @@ +/* + SDL - Simple DirectMedia Layer @@ -11600,9 +11604,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxaccel.c SDL-1.2.15-aros/src/video/cgx/ +} + +#endif -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxaccel_c.h SDL-1.2.15-aros/src/video/cgx/SDL_cgxaccel_c.h ---- SDL-1.2.15/src/video/cgx/SDL_cgxaccel_c.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxaccel_c.h 2014-08-23 18:00:57.040780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxaccel_c.h SDL-1.2.15/src/video/cgx/SDL_cgxaccel_c.h +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxaccel_c.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxaccel_c.h 2015-05-09 15:09:59.766739512 +0200 @@ -0,0 +1,64 @@ +/* + SDL - Simple DirectMedia Layer @@ -11668,9 +11672,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxaccel_c.h SDL-1.2.15-aros/src/video/cg +#define CGX_FlipHWSurface(this, surface) CGX_FlipHWSurfaceI(this, surface, SDLBase) +#define CGX_FillHWRect(this, dst, dstrect, colo) CGX_FillHWRectI(this, dst, dstrect, colo, SDLBase) +#endif -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxevents.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxevents.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxevents.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxevents.c 2014-08-23 18:00:57.040780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxevents.c SDL-1.2.15/src/video/cgx/SDL_cgxevents.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxevents.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxevents.c 2015-05-09 15:09:59.766739512 +0200 @@ -0,0 +1,491 @@ +/* + SDL - Simple DirectMedia Layer @@ -12163,9 +12167,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxevents.c SDL-1.2.15-aros/src/video/cgx + MISC_keymap[RAWKEY_HOME ] = SDLK_HOME; + MISC_keymap[RAWKEY_END ] = SDLK_END; +} -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxevents_c.h SDL-1.2.15-aros/src/video/cgx/SDL_cgxevents_c.h ---- SDL-1.2.15/src/video/cgx/SDL_cgxevents_c.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxevents_c.h 2014-08-23 18:00:57.040780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxevents_c.h SDL-1.2.15/src/video/cgx/SDL_cgxevents_c.h +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxevents_c.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxevents_c.h 2015-05-09 15:09:59.766739512 +0200 @@ -0,0 +1,35 @@ +/* + SDL - Simple DirectMedia Layer @@ -12202,9 +12206,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxevents_c.h SDL-1.2.15-aros/src/video/c +#endif + + -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_c.h SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_c.h ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_c.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_c.h 2014-08-23 18:00:57.040780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_c.h SDL-1.2.15/src/video/cgx/SDL_cgxgl_c.h +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_c.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_c.h 2015-05-09 15:09:59.766739512 +0200 @@ -0,0 +1,77 @@ +/* + SDL - Simple DirectMedia Layer @@ -12283,9 +12287,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_c.h SDL-1.2.15-aros/src/video/cgx/S +#endif + +#undef _THIS -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_CreateContext.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_CreateContext.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_CreateContext.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_CreateContext.c 2014-08-23 18:00:57.040780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_CreateContext.c SDL-1.2.15/src/video/cgx/SDL_cgxgl_CreateContext.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_CreateContext.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_CreateContext.c 2015-05-09 15:09:59.766739512 +0200 @@ -0,0 +1,119 @@ +/* + SDL - Simple DirectMedia Layer @@ -12406,9 +12410,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_CreateContext.c SDL-1.2.15-aros/src + return(-1); +#endif +} -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_DestroyContext.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_DestroyContext.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_DestroyContext.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_DestroyContext.c 2014-08-23 19:57:27.532900024 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_DestroyContext.c SDL-1.2.15/src/video/cgx/SDL_cgxgl_DestroyContext.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_DestroyContext.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_DestroyContext.c 2015-05-09 15:09:59.766739512 +0200 @@ -0,0 +1,57 @@ +/* + SDL - Simple DirectMedia Layer @@ -12467,9 +12471,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_DestroyContext.c SDL-1.2.15-aros/sr + } +#endif +} -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetAttribute.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_GetAttribute.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetAttribute.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_GetAttribute.c 2014-08-23 20:02:49.908905558 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_GetAttribute.c SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetAttribute.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_GetAttribute.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetAttribute.c 2015-05-09 15:09:59.767739510 +0200 @@ -0,0 +1,103 @@ +/* + SDL - Simple DirectMedia Layer @@ -12574,9 +12578,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetAttribute.c SDL-1.2.15-aros/src/ + return 0; +} +#endif /* SDL_VIDEO_OPENGL */ -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetProcAddress.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_GetProcAddress.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetProcAddress.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_GetProcAddress.c 2014-08-23 20:02:06.928904820 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_GetProcAddress.c SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetProcAddress.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_GetProcAddress.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetProcAddress.c 2015-05-09 15:09:59.767739510 +0200 @@ -0,0 +1,59 @@ +/* + SDL - Simple DirectMedia Layer @@ -12637,9 +12641,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_GetProcAddress.c SDL-1.2.15-aros/sr + return func; +} +#endif /* SDL_VIDEO_OPENGL */ -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_LoadLibrary.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_LoadLibrary.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_LoadLibrary.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_LoadLibrary.c 2014-08-23 19:54:53.648897383 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_LoadLibrary.c SDL-1.2.15/src/video/cgx/SDL_cgxgl_LoadLibrary.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_LoadLibrary.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_LoadLibrary.c 2015-05-09 15:09:59.767739510 +0200 @@ -0,0 +1,70 @@ +/* + SDL - Simple DirectMedia Layer @@ -12711,9 +12715,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_LoadLibrary.c SDL-1.2.15-aros/src/v + return 0; +} +#endif /* SDL_VIDEO_OPENGL */ -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_MakeCurrent.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_MakeCurrent.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_MakeCurrent.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_MakeCurrent.c 2014-08-23 19:59:19.292901943 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_MakeCurrent.c SDL-1.2.15/src/video/cgx/SDL_cgxgl_MakeCurrent.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_MakeCurrent.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_MakeCurrent.c 2015-05-09 15:09:59.767739510 +0200 @@ -0,0 +1,57 @@ +/* + SDL - Simple DirectMedia Layer @@ -12772,9 +12776,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_MakeCurrent.c SDL-1.2.15-aros/src/v + return 0; +} +#endif /* SDL_VIDEO_OPENGL */ -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_Quit.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_Quit.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_Quit.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_Quit.c 2014-08-23 19:55:49.484898341 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_Quit.c SDL-1.2.15/src/video/cgx/SDL_cgxgl_Quit.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_Quit.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_Quit.c 2015-05-09 15:09:59.767739510 +0200 @@ -0,0 +1,58 @@ +/* + SDL - Simple DirectMedia Layer @@ -12834,9 +12838,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_Quit.c SDL-1.2.15-aros/src/video/cg + } +#endif +} -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_SwapBuffers.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_SwapBuffers.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_SwapBuffers.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_SwapBuffers.c 2014-08-23 20:01:02.836903720 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_SwapBuffers.c SDL-1.2.15/src/video/cgx/SDL_cgxgl_SwapBuffers.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_SwapBuffers.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_SwapBuffers.c 2015-05-09 15:09:59.767739510 +0200 @@ -0,0 +1,55 @@ +/* + SDL - Simple DirectMedia Layer @@ -12893,9 +12897,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_SwapBuffers.c SDL-1.2.15-aros/src/v + glASwapBuffers(this->gl_data->glctx); +} +#endif /* SDL_VIDEO_OPENGL */ -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_UpdateContext.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_UpdateContext.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxgl_UpdateContext.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxgl_UpdateContext.c 2014-08-23 19:58:32.556901140 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_UpdateContext.c SDL-1.2.15/src/video/cgx/SDL_cgxgl_UpdateContext.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxgl_UpdateContext.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxgl_UpdateContext.c 2015-05-09 15:09:59.767739510 +0200 @@ -0,0 +1,67 @@ +/* + SDL - Simple DirectMedia Layer @@ -12964,9 +12968,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxgl_UpdateContext.c SDL-1.2.15-aros/src + return -1; +#endif +} -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgximage.c SDL-1.2.15-aros/src/video/cgx/SDL_cgximage.c ---- SDL-1.2.15/src/video/cgx/SDL_cgximage.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgximage.c 2014-08-23 18:00:57.040780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgximage.c SDL-1.2.15/src/video/cgx/SDL_cgximage.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgximage.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgximage.c 2015-05-09 15:09:59.767739510 +0200 @@ -0,0 +1,306 @@ +/* + SDL - Simple DirectMedia Layer @@ -13274,9 +13278,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgximage.c SDL-1.2.15-aros/src/video/cgx/ + this->UpdateRects(this, 1, &screenrect, SDLBase); +#endif +} -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgximage_c.h SDL-1.2.15-aros/src/video/cgx/SDL_cgximage_c.h ---- SDL-1.2.15/src/video/cgx/SDL_cgximage_c.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgximage_c.h 2014-08-23 18:00:57.040780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgximage_c.h SDL-1.2.15/src/video/cgx/SDL_cgximage_c.h +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgximage_c.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgximage_c.h 2015-05-09 15:09:59.767739510 +0200 @@ -0,0 +1,45 @@ +/* + SDL - Simple DirectMedia Layer @@ -13323,9 +13327,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgximage_c.h SDL-1.2.15-aros/src/video/cg +#define CGX_DestroyImage(this, screen) CGX_DestroyImageI(this, screen, SDLBase) +#define CGX_RefreshDisplay(this) CGX_RefreshDisplayI(this, SDLBase) +#endif -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxmodes.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxmodes.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxmodes.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxmodes.c 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxmodes.c SDL-1.2.15/src/video/cgx/SDL_cgxmodes.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxmodes.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxmodes.c 2015-05-09 15:09:59.768739508 +0200 @@ -0,0 +1,236 @@ +/* + SDL - Simple DirectMedia Layer @@ -13563,9 +13567,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxmodes.c SDL-1.2.15-aros/src/video/cgx/ + SDL_modelist = NULL; + } +} -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxmodes_c.h SDL-1.2.15-aros/src/video/cgx/SDL_cgxmodes_c.h ---- SDL-1.2.15/src/video/cgx/SDL_cgxmodes_c.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxmodes_c.h 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxmodes_c.h SDL-1.2.15/src/video/cgx/SDL_cgxmodes_c.h +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxmodes_c.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxmodes_c.h 2015-05-09 15:09:59.768739508 +0200 @@ -0,0 +1,47 @@ +/* + SDL - Simple DirectMedia Layer @@ -13614,9 +13618,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxmodes_c.h SDL-1.2.15-aros/src/video/cg +#define CGX_ListModes(this, format, flags) CGX_ListModesI(this, format, flags, SDLBase) +#define CGX_FreeVideoModes(this) CGX_FreeVideoModesI(this, SDLBase) +#endif -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxmouse.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxmouse.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxmouse.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxmouse.c 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxmouse.c SDL-1.2.15/src/video/cgx/SDL_cgxmouse.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxmouse.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxmouse.c 2015-05-09 15:09:59.768739508 +0200 @@ -0,0 +1,266 @@ +/* + SDL - Simple DirectMedia Layer @@ -13884,9 +13888,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxmouse.c SDL-1.2.15-aros/src/video/cgx/ + /* Check to see if we need to enter or leave mouse relative mode */ + /* under AROS the mouse mode is always absolute => nothing to be done*/ +} -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxmouse_c.h SDL-1.2.15-aros/src/video/cgx/SDL_cgxmouse_c.h ---- SDL-1.2.15/src/video/cgx/SDL_cgxmouse_c.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxmouse_c.h 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxmouse_c.h SDL-1.2.15/src/video/cgx/SDL_cgxmouse_c.h +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxmouse_c.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxmouse_c.h 2015-05-09 15:09:59.768739508 +0200 @@ -0,0 +1,44 @@ +/* + SDL - Simple DirectMedia Layer @@ -13932,9 +13936,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxmouse_c.h SDL-1.2.15-aros/src/video/cg +#define CGX_ShowWMCursor(this, cursor) CGX_ShowWMCursorI(this, cursor, SDLBase) +#define CGX_WarpWMCursor(this, x, y) CGX_WarpWMCursorI(this, x, y, SDLBase) +#endif -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxvideo.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxvideo.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxvideo.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxvideo.c 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxvideo.c SDL-1.2.15/src/video/cgx/SDL_cgxvideo.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxvideo.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxvideo.c 2015-05-09 15:09:59.769739506 +0200 @@ -0,0 +1,1516 @@ +/* + SDL - Simple DirectMedia Layer @@ -15452,9 +15456,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxvideo.c SDL-1.2.15-aros/src/video/cgx/ + SDL_SetError("Gamma correction not supported"); + return(-1); +} -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxvideo.h SDL-1.2.15-aros/src/video/cgx/SDL_cgxvideo.h ---- SDL-1.2.15/src/video/cgx/SDL_cgxvideo.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxvideo.h 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxvideo.h SDL-1.2.15/src/video/cgx/SDL_cgxvideo.h +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxvideo.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxvideo.h 2015-05-09 15:09:59.769739506 +0200 @@ -0,0 +1,138 @@ +/* + SDL - Simple DirectMedia Layer @@ -15594,9 +15598,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxvideo.h SDL-1.2.15-aros/src/video/cgx/ + +#endif /* _SDL_cgxvideo_h */ + -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxwm.c SDL-1.2.15-aros/src/video/cgx/SDL_cgxwm.c ---- SDL-1.2.15/src/video/cgx/SDL_cgxwm.c 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxwm.c 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxwm.c SDL-1.2.15/src/video/cgx/SDL_cgxwm.c +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxwm.c 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxwm.c 2015-05-09 15:09:59.769739506 +0200 @@ -0,0 +1,111 @@ +/* + SDL - Simple DirectMedia Layer @@ -15709,9 +15713,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxwm.c SDL-1.2.15-aros/src/video/cgx/SDL + return(mode); +} + -diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxwm_c.h SDL-1.2.15-aros/src/video/cgx/SDL_cgxwm_c.h ---- SDL-1.2.15/src/video/cgx/SDL_cgxwm_c.h 1970-01-01 01:00:00.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/cgx/SDL_cgxwm_c.h 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/cgx/SDL_cgxwm_c.h SDL-1.2.15/src/video/cgx/SDL_cgxwm_c.h +--- SDL-1.2.15-orig/src/video/cgx/SDL_cgxwm_c.h 1970-01-01 01:00:00.000000000 +0100 ++++ SDL-1.2.15/src/video/cgx/SDL_cgxwm_c.h 2015-05-09 15:09:59.769739506 +0200 @@ -0,0 +1,45 @@ +/* + SDL - Simple DirectMedia Layer @@ -15758,9 +15762,9 @@ diff -ruN SDL-1.2.15/src/video/cgx/SDL_cgxwm_c.h SDL-1.2.15-aros/src/video/cgx/S +#define CGX_GetWMInfo(this, info) CGX_GetWMInfoI(this, info, SDLBase) +#define CGX_GrabWMInput(this, mode) CGX_GrabWMInputI(this, mode, SDLBase) +#endif -diff -ruN SDL-1.2.15/src/video/dummy/SDL_nullevents.c SDL-1.2.15-aros/src/video/dummy/SDL_nullevents.c ---- SDL-1.2.15/src/video/dummy/SDL_nullevents.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/dummy/SDL_nullevents.c 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/dummy/SDL_nullevents.c SDL-1.2.15/src/video/dummy/SDL_nullevents.c +--- SDL-1.2.15-orig/src/video/dummy/SDL_nullevents.c 2015-05-09 17:47:54.283774294 +0200 ++++ SDL-1.2.15/src/video/dummy/SDL_nullevents.c 2015-05-09 15:09:59.769739506 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -15794,9 +15798,9 @@ diff -ruN SDL-1.2.15/src/video/dummy/SDL_nullevents.c SDL-1.2.15-aros/src/video/ { /* do nothing. */ } -diff -ruN SDL-1.2.15/src/video/dummy/SDL_nullevents_c.h SDL-1.2.15-aros/src/video/dummy/SDL_nullevents_c.h ---- SDL-1.2.15/src/video/dummy/SDL_nullevents_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/dummy/SDL_nullevents_c.h 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/dummy/SDL_nullevents_c.h SDL-1.2.15/src/video/dummy/SDL_nullevents_c.h +--- SDL-1.2.15-orig/src/video/dummy/SDL_nullevents_c.h 2015-05-09 17:47:54.283774294 +0200 ++++ SDL-1.2.15/src/video/dummy/SDL_nullevents_c.h 2015-05-09 15:09:59.769739506 +0200 @@ -26,8 +26,13 @@ /* Variables and functions exported by SDL_sysevents.c to other parts of the native video subsystem (SDL_sysvideo.c) @@ -15811,9 +15815,9 @@ diff -ruN SDL-1.2.15/src/video/dummy/SDL_nullevents_c.h SDL-1.2.15-aros/src/vide /* end of SDL_nullevents_c.h ... */ -diff -ruN SDL-1.2.15/src/video/dummy/SDL_nullmouse.c SDL-1.2.15-aros/src/video/dummy/SDL_nullmouse.c ---- SDL-1.2.15/src/video/dummy/SDL_nullmouse.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/dummy/SDL_nullmouse.c 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/dummy/SDL_nullmouse.c SDL-1.2.15/src/video/dummy/SDL_nullmouse.c +--- SDL-1.2.15-orig/src/video/dummy/SDL_nullmouse.c 2015-05-09 17:47:54.283774294 +0200 ++++ SDL-1.2.15/src/video/dummy/SDL_nullmouse.c 2015-05-09 15:09:59.770739504 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -15826,9 +15830,9 @@ diff -ruN SDL-1.2.15/src/video/dummy/SDL_nullmouse.c SDL-1.2.15-aros/src/video/d #include "SDL_config.h" #include "SDL_mouse.h" -diff -ruN SDL-1.2.15/src/video/dummy/SDL_nullvideo.c SDL-1.2.15-aros/src/video/dummy/SDL_nullvideo.c ---- SDL-1.2.15/src/video/dummy/SDL_nullvideo.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/dummy/SDL_nullvideo.c 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/dummy/SDL_nullvideo.c SDL-1.2.15/src/video/dummy/SDL_nullvideo.c +--- SDL-1.2.15-orig/src/video/dummy/SDL_nullvideo.c 2015-05-09 17:47:54.283774294 +0200 ++++ SDL-1.2.15/src/video/dummy/SDL_nullvideo.c 2015-05-09 15:09:59.770739504 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -16003,9 +16007,9 @@ diff -ruN SDL-1.2.15/src/video/dummy/SDL_nullvideo.c SDL-1.2.15-aros/src/video/d { if (this->screen->pixels != NULL) { -diff -ruN SDL-1.2.15/src/video/SDL_blit_0.c SDL-1.2.15-aros/src/video/SDL_blit_0.c ---- SDL-1.2.15/src/video/SDL_blit_0.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_blit_0.c 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_blit_0.c SDL-1.2.15/src/video/SDL_blit_0.c +--- SDL-1.2.15-orig/src/video/SDL_blit_0.c 2015-05-09 17:47:54.310774223 +0200 ++++ SDL-1.2.15/src/video/SDL_blit_0.c 2015-05-09 15:09:59.770739504 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -16030,9 +16034,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_blit_0.c SDL-1.2.15-aros/src/video/SDL_blit_0 { int which; -diff -ruN SDL-1.2.15/src/video/SDL_blit_1.c SDL-1.2.15-aros/src/video/SDL_blit_1.c ---- SDL-1.2.15/src/video/SDL_blit_1.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_blit_1.c 2014-08-23 18:00:57.044780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_blit_1.c SDL-1.2.15/src/video/SDL_blit_1.c +--- SDL-1.2.15-orig/src/video/SDL_blit_1.c 2015-05-09 17:47:54.309774226 +0200 ++++ SDL-1.2.15/src/video/SDL_blit_1.c 2015-05-09 15:09:59.770739504 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -16057,9 +16061,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_blit_1.c SDL-1.2.15-aros/src/video/SDL_blit_1 { int which; SDL_PixelFormat *dstfmt; -diff -ruN SDL-1.2.15/src/video/SDL_blit_A.c SDL-1.2.15-aros/src/video/SDL_blit_A.c ---- SDL-1.2.15/src/video/SDL_blit_A.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_blit_A.c 2014-08-23 18:00:57.048780026 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_blit_A.c SDL-1.2.15/src/video/SDL_blit_A.c +--- SDL-1.2.15-orig/src/video/SDL_blit_A.c 2015-05-09 17:47:54.282774297 +0200 ++++ SDL-1.2.15/src/video/SDL_blit_A.c 2015-05-09 15:09:59.770739504 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -16085,9 +16089,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_blit_A.c SDL-1.2.15-aros/src/video/SDL_blit_A { SDL_PixelFormat *sf = surface->format; SDL_PixelFormat *df = surface->map->dst->format; -diff -ruN SDL-1.2.15/src/video/SDL_blit.c SDL-1.2.15-aros/src/video/SDL_blit.c ---- SDL-1.2.15/src/video/SDL_blit.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_blit.c 2014-08-23 18:00:57.048780026 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_blit.c SDL-1.2.15/src/video/SDL_blit.c +--- SDL-1.2.15-orig/src/video/SDL_blit.c 2015-05-09 17:47:54.282774297 +0200 ++++ SDL-1.2.15/src/video/SDL_blit.c 2015-05-09 15:09:59.771739502 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -16192,9 +16196,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_blit.c SDL-1.2.15-aros/src/video/SDL_blit.c } } -diff -ruN SDL-1.2.15/src/video/SDL_blit.h SDL-1.2.15-aros/src/video/SDL_blit.h ---- SDL-1.2.15/src/video/SDL_blit.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_blit.h 2014-08-23 18:00:57.048780026 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_blit.h SDL-1.2.15/src/video/SDL_blit.h +--- SDL-1.2.15-orig/src/video/SDL_blit.h 2015-05-09 17:47:54.281774300 +0200 ++++ SDL-1.2.15/src/video/SDL_blit.h 2015-05-09 15:09:59.771739502 +0200 @@ -40,6 +40,9 @@ SDL_PixelFormat *src; Uint8 *table; @@ -16235,9 +16239,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_blit.h SDL-1.2.15-aros/src/video/SDL_blit.h /* * Useful macros for blitting routines -diff -ruN SDL-1.2.15/src/video/SDL_blit_N.c SDL-1.2.15-aros/src/video/SDL_blit_N.c ---- SDL-1.2.15/src/video/SDL_blit_N.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_blit_N.c 2014-08-23 18:00:57.048780026 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_blit_N.c SDL-1.2.15/src/video/SDL_blit_N.c +--- SDL-1.2.15-orig/src/video/SDL_blit_N.c 2015-05-09 17:47:54.284774292 +0200 ++++ SDL-1.2.15/src/video/SDL_blit_N.c 2015-05-09 15:09:59.771739502 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -16262,9 +16266,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_blit_N.c SDL-1.2.15-aros/src/video/SDL_blit_N { struct private_swaccel *sdata; SDL_PixelFormat *srcfmt; -diff -ruN SDL-1.2.15/src/video/SDL_bmp.c SDL-1.2.15-aros/src/video/SDL_bmp.c ---- SDL-1.2.15/src/video/SDL_bmp.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_bmp.c 2014-08-23 18:00:57.048780026 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_bmp.c SDL-1.2.15/src/video/SDL_bmp.c +--- SDL-1.2.15-orig/src/video/SDL_bmp.c 2015-05-09 17:47:54.282774297 +0200 ++++ SDL-1.2.15/src/video/SDL_bmp.c 2015-05-09 15:09:59.772739500 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -16329,9 +16333,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_bmp.c SDL-1.2.15-aros/src/video/SDL_bmp.c + AROS_LIBFUNC_EXIT +#endif } -diff -ruN SDL-1.2.15/src/video/SDL_cursor.c SDL-1.2.15-aros/src/video/SDL_cursor.c ---- SDL-1.2.15/src/video/SDL_cursor.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_cursor.c 2014-08-23 18:00:57.048780026 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_cursor.c SDL-1.2.15/src/video/SDL_cursor.c +--- SDL-1.2.15-orig/src/video/SDL_cursor.c 2015-05-09 17:47:54.309774226 +0200 ++++ SDL-1.2.15/src/video/SDL_cursor.c 2015-05-09 15:09:59.772739500 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -16773,9 +16777,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_cursor.c SDL-1.2.15-aros/src/video/SDL_cursor { int savelen; -diff -ruN SDL-1.2.15/src/video/SDL_cursor_c.h SDL-1.2.15-aros/src/video/SDL_cursor_c.h ---- SDL-1.2.15/src/video/SDL_cursor_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_cursor_c.h 2014-08-23 18:00:57.048780026 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_cursor_c.h SDL-1.2.15/src/video/SDL_cursor_c.h +--- SDL-1.2.15-orig/src/video/SDL_cursor_c.h 2015-05-09 17:47:54.283774294 +0200 ++++ SDL-1.2.15/src/video/SDL_cursor_c.h 2015-05-09 15:09:59.772739500 +0200 @@ -24,6 +24,7 @@ /* Useful variables and functions from SDL_cursor.c */ #include "SDL_mouse.h" @@ -16852,9 +16856,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_cursor_c.h SDL-1.2.15-aros/src/video/SDL_curs (CURSOR_VISIBLE|CURSOR_USINGSW)) -extern volatile int SDL_cursorstate; -diff -ruN SDL-1.2.15/src/video/SDL_gamma.c SDL-1.2.15-aros/src/video/SDL_gamma.c ---- SDL-1.2.15/src/video/SDL_gamma.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_gamma.c 2014-08-23 18:00:57.052780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_gamma.c SDL-1.2.15/src/video/SDL_gamma.c +--- SDL-1.2.15-orig/src/video/SDL_gamma.c 2015-05-09 17:47:54.309774226 +0200 ++++ SDL-1.2.15/src/video/SDL_gamma.c 2015-05-09 15:09:59.772739500 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -17006,9 +17010,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_gamma.c SDL-1.2.15-aros/src/video/SDL_gamma.c + AROS_LIBFUNC_EXIT +#endif } -diff -ruN SDL-1.2.15/src/video/SDL_pixels.c SDL-1.2.15-aros/src/video/SDL_pixels.c ---- SDL-1.2.15/src/video/SDL_pixels.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_pixels.c 2014-08-23 18:00:57.052780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_pixels.c SDL-1.2.15/src/video/SDL_pixels.c +--- SDL-1.2.15-orig/src/video/SDL_pixels.c 2015-05-09 17:47:54.281774300 +0200 ++++ SDL-1.2.15/src/video/SDL_pixels.c 2015-05-09 15:09:59.773739499 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -17228,9 +17232,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_pixels.c SDL-1.2.15-aros/src/video/SDL_pixels { SDL_PixelFormat *srcfmt; SDL_PixelFormat *dstfmt; -diff -ruN SDL-1.2.15/src/video/SDL_pixels_c.h SDL-1.2.15-aros/src/video/SDL_pixels_c.h ---- SDL-1.2.15/src/video/SDL_pixels_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_pixels_c.h 2014-08-23 18:00:57.052780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_pixels_c.h SDL-1.2.15/src/video/SDL_pixels_c.h +--- SDL-1.2.15-orig/src/video/SDL_pixels_c.h 2015-05-09 17:47:54.310774223 +0200 ++++ SDL-1.2.15/src/video/SDL_pixels_c.h 2015-05-09 15:09:59.773739499 +0200 @@ -25,18 +25,30 @@ #include "SDL_blit.h" @@ -17265,9 +17269,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_pixels_c.h SDL-1.2.15-aros/src/video/SDL_pixe extern void SDL_FreeBlitMap(SDL_BlitMap *map); /* Miscellaneous functions */ -diff -ruN SDL-1.2.15/src/video/SDL_RLEaccel.c SDL-1.2.15-aros/src/video/SDL_RLEaccel.c ---- SDL-1.2.15/src/video/SDL_RLEaccel.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_RLEaccel.c 2014-08-23 18:00:57.052780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_RLEaccel.c SDL-1.2.15/src/video/SDL_RLEaccel.c +--- SDL-1.2.15-orig/src/video/SDL_RLEaccel.c 2015-05-09 17:47:54.282774297 +0200 ++++ SDL-1.2.15/src/video/SDL_RLEaccel.c 2015-05-09 15:09:59.773739499 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -17384,9 +17388,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_RLEaccel.c SDL-1.2.15-aros/src/video/SDL_RLEa { if ( (surface->flags & SDL_RLEACCEL) == SDL_RLEACCEL ) { surface->flags &= ~SDL_RLEACCEL; -diff -ruN SDL-1.2.15/src/video/SDL_RLEaccel_c.h SDL-1.2.15-aros/src/video/SDL_RLEaccel_c.h ---- SDL-1.2.15/src/video/SDL_RLEaccel_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_RLEaccel_c.h 2014-08-23 18:00:57.052780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_RLEaccel_c.h SDL-1.2.15/src/video/SDL_RLEaccel_c.h +--- SDL-1.2.15-orig/src/video/SDL_RLEaccel_c.h 2015-05-09 17:47:54.309774226 +0200 ++++ SDL-1.2.15/src/video/SDL_RLEaccel_c.h 2015-05-09 15:09:59.773739499 +0200 @@ -23,9 +23,20 @@ /* Useful functions and variables from SDL_RLEaccel.c */ @@ -17410,9 +17414,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_RLEaccel_c.h SDL-1.2.15-aros/src/video/SDL_RL +#define SDL_UnRLESurface(surface, recode) SDL_UnRLESurfaceI(surface, recode, SDLBase) +#endif \ No newline at end of file -diff -ruN SDL-1.2.15/src/video/SDL_stretch.c SDL-1.2.15-aros/src/video/SDL_stretch.c ---- SDL-1.2.15/src/video/SDL_stretch.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_stretch.c 2014-08-23 18:00:57.052780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_stretch.c SDL-1.2.15/src/video/SDL_stretch.c +--- SDL-1.2.15-orig/src/video/SDL_stretch.c 2015-05-09 17:47:54.309774226 +0200 ++++ SDL-1.2.15/src/video/SDL_stretch.c 2015-05-09 15:09:59.773739499 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -17469,9 +17473,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_stretch.c SDL-1.2.15-aros/src/video/SDL_stret +#endif } -diff -ruN SDL-1.2.15/src/video/SDL_stretch_c.h SDL-1.2.15-aros/src/video/SDL_stretch_c.h ---- SDL-1.2.15/src/video/SDL_stretch_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_stretch_c.h 2014-08-23 18:00:57.052780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_stretch_c.h SDL-1.2.15/src/video/SDL_stretch_c.h +--- SDL-1.2.15-orig/src/video/SDL_stretch_c.h 2015-05-09 17:47:54.282774297 +0200 ++++ SDL-1.2.15/src/video/SDL_stretch_c.h 2015-05-09 15:09:59.774739497 +0200 @@ -24,6 +24,7 @@ /* Perform a stretch blit between two surfaces of the same format. NOTE: This function is not safe to call from multiple threads! @@ -17481,9 +17485,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_stretch_c.h SDL-1.2.15-aros/src/video/SDL_str SDL_Surface *dst, SDL_Rect *dstrect); - +#endif -diff -ruN SDL-1.2.15/src/video/SDL_surface.c SDL-1.2.15-aros/src/video/SDL_surface.c ---- SDL-1.2.15/src/video/SDL_surface.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_surface.c 2014-08-23 18:00:57.052780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_surface.c SDL-1.2.15/src/video/SDL_surface.c +--- SDL-1.2.15-orig/src/video/SDL_surface.c 2015-05-09 17:47:54.282774297 +0200 ++++ SDL-1.2.15/src/video/SDL_surface.c 2015-05-09 15:09:59.774739497 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -17974,9 +17978,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_surface.c SDL-1.2.15-aros/src/video/SDL_surfa + AROS_LIBFUNC_EXIT +#endif } -diff -ruN SDL-1.2.15/src/video/SDL_sysvideo.h SDL-1.2.15-aros/src/video/SDL_sysvideo.h ---- SDL-1.2.15/src/video/SDL_sysvideo.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_sysvideo.h 2014-08-23 18:00:57.052780027 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_sysvideo.h SDL-1.2.15/src/video/SDL_sysvideo.h +--- SDL-1.2.15-orig/src/video/SDL_sysvideo.h 2015-05-09 17:47:54.284774292 +0200 ++++ SDL-1.2.15/src/video/SDL_sysvideo.h 2015-05-09 15:09:59.774739497 +0200 @@ -37,6 +37,10 @@ #include "SDL_opengl.h" #endif /* SDL_VIDEO_OPENGL */ @@ -18144,9 +18148,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_sysvideo.h SDL-1.2.15-aros/src/video/SDL_sysv #define SDL_VideoSurface (current_video->screen) #define SDL_ShadowSurface (current_video->shadow) -diff -ruN SDL-1.2.15/src/video/SDL_video.c SDL-1.2.15-aros/src/video/SDL_video.c ---- SDL-1.2.15/src/video/SDL_video.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_video.c 2014-08-23 18:00:57.056780028 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_video.c SDL-1.2.15/src/video/SDL_video.c +--- SDL-1.2.15-orig/src/video/SDL_video.c 2015-05-09 17:47:54.282774297 +0200 ++++ SDL-1.2.15/src/video/SDL_video.c 2015-05-09 15:09:59.775739495 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -19333,9 +19337,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_video.c SDL-1.2.15-aros/src/video/SDL_video.c } else { return(0); } -diff -ruN SDL-1.2.15/src/video/SDL_yuv.c SDL-1.2.15-aros/src/video/SDL_yuv.c ---- SDL-1.2.15/src/video/SDL_yuv.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_yuv.c 2014-08-23 18:00:57.056780028 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_yuv.c SDL-1.2.15/src/video/SDL_yuv.c +--- SDL-1.2.15-orig/src/video/SDL_yuv.c 2015-05-09 17:47:54.283774294 +0200 ++++ SDL-1.2.15/src/video/SDL_yuv.c 2015-05-09 15:09:59.775739495 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -19490,9 +19494,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_yuv.c SDL-1.2.15-aros/src/video/SDL_yuv.c + AROS_LIBFUNC_EXIT +#endif } -diff -ruN SDL-1.2.15/src/video/SDL_yuvfuncs.h SDL-1.2.15-aros/src/video/SDL_yuvfuncs.h ---- SDL-1.2.15/src/video/SDL_yuvfuncs.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_yuvfuncs.h 2014-08-23 18:00:57.056780028 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_yuvfuncs.h SDL-1.2.15/src/video/SDL_yuvfuncs.h +--- SDL-1.2.15-orig/src/video/SDL_yuvfuncs.h 2015-05-09 17:47:54.309774226 +0200 ++++ SDL-1.2.15/src/video/SDL_yuvfuncs.h 2015-05-09 15:09:59.775739495 +0200 @@ -30,8 +30,15 @@ #define _THIS SDL_VideoDevice *_this #endif @@ -19509,9 +19513,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_yuvfuncs.h SDL-1.2.15-aros/src/video/SDL_yuvf + void (*FreeHW)(_THIS, SDL_Overlay *overlay, struct SDLBase *SDLBase); +#endif }; -diff -ruN SDL-1.2.15/src/video/SDL_yuv_mmx.c SDL-1.2.15-aros/src/video/SDL_yuv_mmx.c ---- SDL-1.2.15/src/video/SDL_yuv_mmx.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_yuv_mmx.c 2014-08-23 18:00:57.056780028 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_yuv_mmx.c SDL-1.2.15/src/video/SDL_yuv_mmx.c +--- SDL-1.2.15-orig/src/video/SDL_yuv_mmx.c 2015-05-09 17:47:54.309774226 +0200 ++++ SDL-1.2.15/src/video/SDL_yuv_mmx.c 2015-05-09 15:09:59.775739495 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -19524,9 +19528,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_yuv_mmx.c SDL-1.2.15-aros/src/video/SDL_yuv_m #include "SDL_config.h" #if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES -diff -ruN SDL-1.2.15/src/video/SDL_yuv_sw.c SDL-1.2.15-aros/src/video/SDL_yuv_sw.c ---- SDL-1.2.15/src/video/SDL_yuv_sw.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_yuv_sw.c 2014-08-23 18:00:57.056780028 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_yuv_sw.c SDL-1.2.15/src/video/SDL_yuv_sw.c +--- SDL-1.2.15-orig/src/video/SDL_yuv_sw.c 2015-05-09 17:47:54.283774294 +0200 ++++ SDL-1.2.15/src/video/SDL_yuv_sw.c 2015-05-09 15:09:59.776739493 +0200 @@ -19,6 +19,11 @@ Sam Lantinga slouken@libsdl.org @@ -19593,9 +19597,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_yuv_sw.c SDL-1.2.15-aros/src/video/SDL_yuv_sw { struct private_yuvhwdata *swdata; -diff -ruN SDL-1.2.15/src/video/SDL_yuv_sw_c.h SDL-1.2.15-aros/src/video/SDL_yuv_sw_c.h ---- SDL-1.2.15/src/video/SDL_yuv_sw_c.h 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/src/video/SDL_yuv_sw_c.h 2014-08-23 18:00:57.056780028 +0200 +diff -Naur SDL-1.2.15-orig/src/video/SDL_yuv_sw_c.h SDL-1.2.15/src/video/SDL_yuv_sw_c.h +--- SDL-1.2.15-orig/src/video/SDL_yuv_sw_c.h 2015-05-09 17:47:54.308774229 +0200 ++++ SDL-1.2.15/src/video/SDL_yuv_sw_c.h 2015-05-09 15:09:59.776739493 +0200 @@ -25,7 +25,7 @@ #include "SDL_sysvideo.h" @@ -19625,9 +19629,9 @@ diff -ruN SDL-1.2.15/src/video/SDL_yuv_sw_c.h SDL-1.2.15-aros/src/video/SDL_yuv_ +#define SDL_DisplayYUV_SW SDL_DisplayYUV_SWI +#define SDL_FreeYUV_SW SDL_FreeYUV_SWI +#endif -diff -ruN SDL-1.2.15/test/testplatform.c SDL-1.2.15-aros/test/testplatform.c ---- SDL-1.2.15/test/testplatform.c 2012-01-19 07:30:06.000000000 +0100 -+++ SDL-1.2.15-aros/test/testplatform.c 2014-08-23 18:00:57.056780028 +0200 +diff -Naur SDL-1.2.15-orig/test/testplatform.c SDL-1.2.15/test/testplatform.c +--- SDL-1.2.15-orig/test/testplatform.c 2015-05-09 17:47:54.279774305 +0200 ++++ SDL-1.2.15/test/testplatform.c 2015-05-09 15:09:59.776739493 +0200 @@ -197,6 +197,8 @@ #else "Windows" -- 2.11.4.GIT