Some fixes that were discovered when trying to get OS/2 audio working…

… again...
libsdl-org · Oct 8, 2006 · afcb91c235a6752dcea9f644d99c9e751872c46c · afcb91c
1 parent f33cac4
commit afcb91c235a6752dcea9f644d99c9e751872c46c
Unified Split

Showing with 7 additions and 7 deletions.

+1 −1 include/SDL_thread.h

+2 −2 src/audio/SDL_audio.c

+1 −1 src/events/SDL_mouse.c

+3 −3 src/video/SDL_rendercopy.h
diff --git a/include/SDL_thread.h b/include/SDL_thread.h
@@ -91,7 +91,7 @@ typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
 typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
 #endif
 
-extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(int (*fn) (void *),
+extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(int (SDLCALL * f) (void *),
                                                      void *data,
                                                      pfnSDL_CurrentBeginThread
                                                      pfnBeginThread,

diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
@@ -614,7 +614,7 @@ open_audio_device(const char *devname, int iscapture,
         for (i = 0; i < SDL_arraysize(open_devices); i++) {
             if ((open_devices[i]) && (open_devices[i]->iscapture)) {
                 SDL_SetError("Audio device already open");
-                return;
+                return 0;
             }
         }
     }
@@ -629,7 +629,7 @@ open_audio_device(const char *devname, int iscapture,
         for (i = 0; i < SDL_arraysize(open_devices); i++) {
             if ((open_devices[i]) && (!open_devices[i]->iscapture)) {
                 SDL_SetError("Audio device already open");
-                return;
+                return 0;
             }
         }
     }

diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
@@ -165,7 +165,7 @@ SDL_GetMouseFocusWindow()
     return mouse->focus;
 }
 
-static int
+static int SDLCALL
 FlushMouseMotion(void *param, SDL_Event * event)
 {
     if (event->type == SDL_MOUSEMOTION

diff --git a/src/video/SDL_rendercopy.h b/src/video/SDL_rendercopy.h
@@ -33,18 +33,18 @@
 #define SDL_RENDERCOPY_NEAREST          0x0100
 
 typedef struct {
-    void *src;
+    Uint8 *src;
     int src_w, src_h;
     int src_pitch;
-    void *dst;
+    Uint8 *dst;
     int dst_w, dst_h;
     int dst_pitch;
     void *aux_data;
     int flags;
     Uint8 r, g, b, a;
 } SDL_RenderCopyData;
 
-typedef int (*SDL_RenderCopyFunc)(SDL_RenderCopyData *data);
+typedef int (SDLCALL * SDL_RenderCopyFunc)(SDL_RenderCopyData *data);
 
 extern SDL_RenderCopyFunc SDLCALL SDL_GetRenderCopyFunc(Uint32 src_format, Uint32 dst_format, int modMode, int blendMode, int scaleMode);