X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_sd.c;h=610f7ed0d2e867c555acd7d2f9bc61fcbeeae143;hb=adb425e17c32e33e71670dd69c909717f1d65acb;hp=7e16839a3dd430ecb6c84ff40d4bbfc33d8e4ae5;hpb=96cfa49038b522c12f53bc49bde7b66f00096f77;p=16.git

diff --git a/src/lib/16_sd.c b/src/lib/16_sd.c
index 7e16839a..610f7ed0 100755
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -226,7 +226,7 @@ void SD_Initimf(global_game_variables_t *gvar)
 void SD_imf_free_music(global_game_variables_t *gvar)
 {
 //	if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);
-	MM_FreePtr(MEMPTR gvar->ca.audiosegs[0], gvar);	//TODO make behave like id engine
+	MM_FreePtr(MEMPTRCONV gvar->ca.audiosegs[0], gvar);	//TODO make behave like id engine
 	gvar->ca.sd.imf_music = gvar->ca.sd.imf_play_ptr = gvar->ca.sd.imf_music_end = NULL;
 	gvar->ca.sd.imf_delay_countdown = 0;
 }
@@ -256,7 +256,7 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
 	}
 	len -= len & 3;
 
-	MM_GetPtr(MEMPTR gvar->ca.audiosegs[0],len, gvar);
+	MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0],len, gvar);
 	gvar->ca.sd.imf_music = (struct imf_entry *)gvar->ca.audiosegs[0];
 	if (gvar->ca.sd.imf_music == NULL) {
 		close(fd);
@@ -270,7 +270,6 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
 	return 1;
 }
 
-#ifdef LIBIRQ0
 struct glob_game_vars	*ggvv;
 // WARNING: subroutine call in interrupt handler. make sure you compile with -zu flag for large/compact memory models
 void interrupt irq0()
@@ -284,7 +283,6 @@ void interrupt irq0()
 		p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);
 	}
 }
-#endif
 
 void SD_imf_tick(global_game_variables_t *gvar)
 {