# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1147892224 0
# Node ID d5d3a6fe05a1efda96c15e1f0e751df0ae1424fb
# Parent  b5a4ac87b98c13dae6d984bdbe40d3700abd1167
Fixed thread callback calling conventions, updated OS/2 DLL name to SDL12.dll

diff -r b5a4ac87b98c -r d5d3a6fe05a1 README.OS2
--- a/README.OS2	Wed May 17 15:08:46 2006 +0000
+++ b/README.OS2	Wed May 17 18:57:04 2006 +0000
@@ -3,7 +3,7 @@
 SDL on OS/2
 ===========
 
-Last updated on May. 1, 2006.
+Last updated on May. 17, 2006.
 
 
 1. How to compile?
@@ -13,8 +13,6 @@
 - The OS/2 Developer's Toolkit
 - The OpenWatcom compiler 
   (http://www.openwatcom.org)
-- The FSLib library
-  (ftp://ftp.netlabs.org/pub/SDL)
 
 First of all, you have to unzip the Watcom-OS2.zip file. This will result in a 
 file called "makefile" and a file called "setvars.cmd" in this folder (and some
@@ -32,7 +30,7 @@
 for debugging.
 
 Then run "wmake".
-This should create the SDL.DLL and the corresponding SDL.LIB file here.
+This should create the SDL12.DLL and the corresponding SDL12.LIB file here.
 
 To test applications, it's a good idea to use the 'debug' build of SDL, and
 redirect the standard output and standard error output to files, to see what
@@ -48,8 +46,8 @@
 2. How to compile the testapps?
 -------------------------------
 
-Once you have SDL.DLL compiled, navigate into the 'test' folder, copy in there
-the newly built SDL.DLL, and copy in there FSLib.DLL.
+Once you have SDL12.DLL compiled, navigate into the 'test' folder, copy in 
+there the newly built SDL12.DLL, and copy in there FSLib.DLL.
 
 Then run "wmake" in there to compile some of the testapps.
 
@@ -191,6 +189,10 @@
 10. Changelog of the OS/2 port
 ------------------------------
 
+Version 1.2.10 - 2006-05-17  - Doodle
+ - Small modifications for v1.2.10 release
+ - Changed DLL name to include version info (currently SDL12.dll)
+
 Version 1.2 - 2006-05-01  - Doodle
  - Modified makefile system to have only one makefile
  - Included FSLib headers, DLL and LIB file
@@ -216,7 +218,7 @@
     SET SDL_USE_PROPORTIONAL_WINDOW=1
     dosbox.exe
    )
-   or, if you have the HOME environment variable set, then SDL.DLL will
+   or, if you have the HOME environment variable set, then SDL12.DLL will
    create a file in that directory called .sdl.proportionals, and you can
    put there the name of executable files that will be automatically made
    proportional.
diff -r b5a4ac87b98c -r d5d3a6fe05a1 Watcom-OS2.zip
Binary file Watcom-OS2.zip has changed
diff -r b5a4ac87b98c -r d5d3a6fe05a1 include/SDL_thread.h
--- a/include/SDL_thread.h	Wed May 17 15:08:46 2006 +0000
+++ b/include/SDL_thread.h	Wed May 17 18:57:04 2006 +0000
@@ -79,7 +79,7 @@
 typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
 #endif
 
-extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (*fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread);
+extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread);
 
 #ifdef __OS2__
 #define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthread, _endthread)
diff -r b5a4ac87b98c -r d5d3a6fe05a1 src/timer/os2/SDL_systimer.c
--- a/src/timer/os2/SDL_systimer.c	Wed May 17 15:08:46 2006 +0000
+++ b/src/timer/os2/SDL_systimer.c	Wed May 17 18:57:04 2006 +0000
@@ -182,7 +182,7 @@
 static int timer_alive = 0;
 static SDL_Thread *timer = NULL;
 
-static int RunTimer(void *unused)
+static int SDLCALL RunTimer(void *unused)
 {
         DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, 0, 0);
         while ( timer_alive ) {