implemented tcmod (all forms)

[xonotic/darkplaces.git] / cd_linux.c

diff --git a/cd_linux.c b/cd_linux.c
index 05bf5c7e6d5a4a7a3b8219ff02698f7d9e2d70ae..2db702cb3f9f2b685ee644377b51e49c997a4fea 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
 // rights reserved.
 
+// suggested by Zero_Dogg to fix a compile problem on Mandriva Linux
+#define __KERNEL_STRICT_NAMES
+
 #include <linux/cdrom.h>
 #include <sys/ioctl.h>
 
@@ -102,7 +105,7 @@ void CDAudio_SysSetVolume (float volume)
        if (cdfile == -1)
                return;
 
-       vol.channel0 = vol.channel1 = volume * 255;
+       vol.channel0 = vol.channel1 = (__u8)(volume * 255);
        vol.channel2 = vol.channel3 = 0;
 
        if (ioctl (cdfile, CDROMVOLCTRL, &vol) == -1)
@@ -110,7 +113,7 @@ void CDAudio_SysSetVolume (float volume)
 }
 
 
-int CDAudio_SysPlay (qbyte track)
+int CDAudio_SysPlay (unsigned char track)
 {
        struct cdrom_tocentry entry;
        struct cdrom_ti ti;