--- BasiliskII/src/AmigaOS/audio_amiga.cpp	1999/10/21 22:39:56	1.4
+++ BasiliskII/src/AmigaOS/audio_amiga.cpp	1999/11/03 10:56:18	1.6
@@ -57,11 +57,7 @@ static int audio_block_fetched = 0;				/
 
 
 // Prototypes
-#ifdef __GNUC__
 static __saveds __attribute__((regparm(3))) ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/);
-#else
-static __saveds __regargs ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/);
-#endif
 
 
 /*
@@ -178,11 +174,7 @@ void audio_exit_stream()
  *  AHI sound callback, request next buffer
  */
 
-#ifdef __GNUC__
 static __saveds __attribute__((regparm(3))) ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/)
-#else
-static __saveds __regargs ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/)
-#endif
 {
 	play_buf ^= 1;
 
@@ -200,7 +192,7 @@ static __saveds __regargs ULONG audio_ca
 
 			// Put data into AHI buffer (convert 8-bit data unsigned->signed)
 			if (AudioStatus.sample_size == 16)
-				memcpy(sample[play_buf].ahisi_Address, Mac2HostAddr(ReadMacInt32(apple_stream_info + scd_buffer)), work_size);
+				Mac2Host_memcpy(sample[play_buf].ahisi_Address, ReadMacInt32(apple_stream_info + scd_buffer), work_size);
 			else {
 				uint32 *p = (uint32 *)Mac2HostAddr(ReadMacInt32(apple_stream_info + scd_buffer));
 				uint32 *q = (uint32 *)sample[play_buf].ahisi_Address;