Browse Source

Fixed compiler warnings.

woollybah 5 years ago
parent
commit
c09464b1b4
4 changed files with 5 additions and 3 deletions
  1. 1 1
      sdl.mod/glue.c
  2. 1 0
      sdlhaptic.mod/glue.c
  3. 1 1
      sdlsystem.mod/glue.c
  4. 2 1
      sdltimer.mod/glue.c

+ 1 - 1
sdl.mod/glue.c

@@ -28,7 +28,7 @@
 
 int sdl_sdl__sdl_rwops_seek(BBObject *, int, int);
 BBLONG sdl_sdl__sdl_rwops_read(BBObject *, void *, BBLONG);
-BBLONG sdl_sdl__sdl_rwops_write(BBObject *, void *, BBLONG);
+BBLONG sdl_sdl__sdl_rwops_write(BBObject *, const void *, BBLONG);
 int sdl_sdl__sdl_rwops_close(BBObject *);
 
 /* ----------------------------------------------------- */

+ 1 - 0
sdlhaptic.mod/glue.c

@@ -21,6 +21,7 @@
     distribution.
 */
 #include "SDL_haptic.h"
+#include <stdlib.h>
 
 void bmx_sdl_haptic_SDLHapticEffect_free(SDL_HapticEffect  * effect) {
 	free(effect);

+ 1 - 1
sdlsystem.mod/glue.c

@@ -140,7 +140,7 @@ void bmx_SDL_EmitSDLEvent( SDL_Event *event, BBObject *source ) {
 		case SDL_USEREVENT:
 			switch (event->user.code) {
 				case BBEVENT_TIMERTICK:
-					bbSDLSystemEmitEvent( BBEVENT_TIMERTICK,event->user.data1,(int)event->user.data2,0,0,0,&bbNullObject );
+					bbSDLSystemEmitEvent( BBEVENT_TIMERTICK,event->user.data1,((int*)event->user.data2)[0],0,0,0,&bbNullObject );
 					return;
 				case 0x802:
 					brl_event_EmitEvent( event->user.data1 );

+ 2 - 1
sdltimer.mod/glue.c

@@ -40,10 +40,11 @@ void bmx_sdl_timer_fire( int id, BBObject * obj, int ticks ) {
     SDL_Event event;
     SDL_UserEvent userevent;
 
+	SDL_zero(event);
     userevent.type = SDL_USEREVENT;
     userevent.code = id,
     userevent.data1 = obj;
-	userevent.data2 = ticks;
+	((int*)userevent.data2)[0] = ticks;
 
     event.type = SDL_USEREVENT;
     event.user = userevent;