X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cd_linux.c;h=6a64e4b590b37e4811767ccdcca8f86218cb1245;hp=9d428f50a9e3602033b1aa079c2dd233f7ccf30f;hb=11e05215e5f3cee630f54b9836dab1b36b5b4ffc;hpb=95f66338c8144989970daa0fa4b38c87e9af94a0

diff --git a/cd_linux.c b/cd_linux.c
index 9d428f50..6a64e4b5 100644
--- 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>
 
@@ -42,7 +45,7 @@ void CDAudio_SysEject (void)
 		return;
 
 	if (ioctl(cdfile, CDROMEJECT) == -1)
-		Con_DPrint("ioctl CDROMEJECT failed\n");
+		Con_Print("ioctl CDROMEJECT failed\n");
 }
 
 
@@ -52,7 +55,7 @@ void CDAudio_SysCloseDoor (void)
 		return;
 
 	if (ioctl(cdfile, CDROMCLOSETRAY) == -1)
-		Con_DPrint("ioctl CDROMCLOSETRAY failed\n");
+		Con_Print("ioctl CDROMCLOSETRAY failed\n");
 }
 
 int CDAudio_SysGetAudioDiskInfo (void)
@@ -64,13 +67,13 @@ int CDAudio_SysGetAudioDiskInfo (void)
 
 	if (ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1)
 	{
-		Con_DPrint("ioctl CDROMREADTOCHDR failed\n");
+		Con_Print("ioctl CDROMREADTOCHDR failed\n");
 		return -1;
 	}
 
 	if (tochdr.cdth_trk0 < 1)
 	{
-		Con_DPrint("CDAudio: no music tracks\n");
+		Con_Print("CDAudio: no music tracks\n");
 		return -1;
 	}
 
@@ -87,7 +90,7 @@ float CDAudio_SysGetVolume (void)
 
 	if (ioctl (cdfile, CDROMVOLREAD, &vol) == -1)
 	{
-		Con_DPrint("ioctl CDROMVOLREAD failed\n");
+		Con_Print("ioctl CDROMVOLREAD failed\n");
 		return -1.0f;
 	}
 
@@ -106,7 +109,7 @@ void CDAudio_SysSetVolume (float volume)
 	vol.channel2 = vol.channel3 = 0;
 
 	if (ioctl (cdfile, CDROMVOLCTRL, &vol) == -1)
-		Con_DPrint("ioctl CDROMVOLCTRL failed\n");
+		Con_Print("ioctl CDROMVOLCTRL failed\n");
 }
 
 
@@ -123,7 +126,7 @@ int CDAudio_SysPlay (qbyte track)
 	entry.cdte_format = CDROM_MSF;
 	if (ioctl(cdfile, CDROMREADTOCENTRY, &entry) == -1)
 	{
-		Con_DPrint("ioctl CDROMREADTOCENTRY failed\n");
+		Con_Print("ioctl CDROMREADTOCENTRY failed\n");
 		return -1;
 	}
 	if (entry.cdte_ctrl == CDROM_DATA_TRACK)
@@ -142,13 +145,13 @@ int CDAudio_SysPlay (qbyte track)
 
 	if (ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1)
 	{
-		Con_DPrint("ioctl CDROMPLAYTRKIND failed\n");
+		Con_Print("ioctl CDROMPLAYTRKIND failed\n");
 		return -1;
 	}
 
 	if (ioctl(cdfile, CDROMRESUME) == -1)
 	{
-		Con_DPrint("ioctl CDROMRESUME failed\n");
+		Con_Print("ioctl CDROMRESUME failed\n");
 		return -1;
 	}
 
@@ -163,7 +166,7 @@ int CDAudio_SysStop (void)
 
 	if (ioctl(cdfile, CDROMSTOP) == -1)
 	{
-		Con_DPrintf("ioctl CDROMSTOP failed (%d)\n", errno);
+		Con_Printf("ioctl CDROMSTOP failed (%d)\n", errno);
 		return -1;
 	}
 
@@ -177,7 +180,7 @@ int CDAudio_SysPause (void)
 
 	if (ioctl(cdfile, CDROMPAUSE) == -1)
 	{
-		Con_DPrint("ioctl CDROMPAUSE failed\n");
+		Con_Print("ioctl CDROMPAUSE failed\n");
 		return -1;
 	}
 
@@ -191,7 +194,7 @@ int CDAudio_SysResume (void)
 		return -1;
 
 	if (ioctl(cdfile, CDROMRESUME) == -1)
-		Con_DPrint("ioctl CDROMRESUME failed\n");
+		Con_Print("ioctl CDROMRESUME failed\n");
 
 	return 0;
 }
@@ -207,7 +210,7 @@ int CDAudio_SysUpdate (void)
 		subchnl.cdsc_format = CDROM_MSF;
 		if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1)
 		{
-			Con_DPrint("ioctl CDROMSUBCHNL failed\n");
+			Con_Print("ioctl CDROMSUBCHNL failed\n");
 			cdPlaying = false;
 			return -1;
 		}
@@ -238,7 +241,7 @@ int CDAudio_SysStartup (void)
 {
 	if ((cdfile = open(cd_dev, O_RDONLY | O_NONBLOCK)) == -1)
 	{
-		Con_DPrintf("CDAudio_SysStartup: open of \"%s\" failed (%i)\n",
+		Con_Printf("CDAudio_SysStartup: open of \"%s\" failed (%i)\n",
 					cd_dev, errno);
 		cdfile = -1;
 		return -1;