diff src/timer/os2/SDL_systimer.c @ 2049:5f6550e5184f

Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk.
author Ryan C. Gordon <icculus@icculus.org>
date Tue, 17 Oct 2006 09:15:21 +0000
parents c121d94672cb
children 866052b01ee5
line wrap: on
line diff
--- a/src/timer/os2/SDL_systimer.c	Sun Oct 01 16:10:41 2006 +0000
+++ b/src/timer/os2/SDL_systimer.c	Tue Oct 17 09:15:21 2006 +0000
@@ -65,24 +65,28 @@
 */
     /* inline asm to avoid runtime inclusion */
     _asm {
-    push edx
-            push eax
-            mov eax, dword ptr hires_now
-            mov edx, dword ptr hires_now + 4
-            sub eax, dword ptr hires_start_ticks
-            sbb edx, dword ptr hires_start_ticks + 4
-            mov ebx, 1000
-            mov ecx, edx
-            mul ebx
-            push eax
-            push edx
-            mov eax, ecx
-            mul ebx
-            pop eax
-            add edx, eax
-            pop eax
-            mov ebx, dword ptr hires_ticks_per_second
-            div ebx mov dword ptr ticks, eax pop edx pop eax}
+        push edx
+        push eax
+        mov eax, dword ptr hires_now
+        mov edx, dword ptr hires_now + 4
+        sub eax, dword ptr hires_start_ticks
+        sbb edx, dword ptr hires_start_ticks + 4
+        mov ebx, 1000
+        mov ecx, edx
+        mul ebx
+        push eax
+        push edx
+        mov eax, ecx
+        mul ebx
+        pop eax
+        add edx, eax
+        pop eax
+        mov ebx, dword ptr hires_ticks_per_second
+        div ebx
+        mov dword ptr ticks, eax
+        pop edx
+        pop eax
+    }
 
     return ticks;
 
@@ -178,7 +182,7 @@
 static int timer_alive = 0;
 static SDL_Thread *timer = NULL;
 
-static int
+static int SDLCALL
 RunTimer(void *unused)
 {
     DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, 0, 0);