[Scummvm-cvs-logs] scummvm master -> 99bb62f0e99f3c63c1d5cbae4f70dff6d5ff0868

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
99bb62f0e9 LINUX: Use classic major/minor macros.


Commit: 99bb62f0e99f3c63c1d5cbae4f70dff6d5ff0868
    https://github.com/scummvm/scummvm/commit/99bb62f0e99f3c63c1d5cbae4f70dff6d5ff0868
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-21T04:42:13+01:00

Commit Message:
LINUX: Use classic major/minor macros.

Makes our Linux Audio CD code work with implementations without gnu_dev_major
and gnu_dev_minor too.

Changed paths:
    backends/audiocd/linux/linux-audiocd.cpp



diff --git a/backends/audiocd/linux/linux-audiocd.cpp b/backends/audiocd/linux/linux-audiocd.cpp
index a5838e1..caa0265 100644
--- a/backends/audiocd/linux/linux-audiocd.cpp
+++ b/backends/audiocd/linux/linux-audiocd.cpp
@@ -62,6 +62,7 @@
 #include <linux/cdrom.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 enum {
 	kLeadoutTrack = 0xAA
@@ -379,8 +380,9 @@ bool LinuxAudioCDManager::tryAddDrive(DeviceList &devices, const Common::String
 
 bool LinuxAudioCDManager::tryAddDrive(DeviceList &devices, dev_t device) {
 	// Construct the block name
-	// (Does anyone have a better way to do this? bdevname is kernel only)
-	Common::String name = Common::String::format("/dev/block/%d:%d", gnu_dev_major(device), gnu_dev_minor(device));
+	// TODO: libblkid's blkid_devno_to_devname is exactly what we look for.
+	// This requires an external dependency though.
+	Common::String name = Common::String::format("/dev/block/%d:%d", major(device), minor(device));
 
 	return tryAddDrive(devices, name, device);
 }