From eda3cfa1e3b8c6ad0558ea03e96fefbfef029c05 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Mon, 7 Jan 2019 15:51:53 +0000 Subject: libcamera: media_object: Rename major/minor functions The system libraries define macro's for major/minor through on some versions of GCC/GLibc. To prevent namespace collisions with these macros, rename our major and minor device node accessors. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- src/libcamera/device_enumerator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libcamera/device_enumerator.cpp') diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp index 7ad1c501..c088f3e5 100644 --- a/src/libcamera/device_enumerator.cpp +++ b/src/libcamera/device_enumerator.cpp @@ -208,10 +208,10 @@ int DeviceEnumerator::addDevice(const std::string &devnode) /* Associate entities to device node paths. */ for (MediaEntity *entity : media->entities()) { - if (entity->major() == 0 && entity->minor() == 0) + if (entity->deviceMajor() == 0 && entity->deviceMinor() == 0) continue; - std::string devnode = lookupDevnode(entity->major(), entity->minor()); + std::string devnode = lookupDevnode(entity->deviceMajor(), entity->deviceMinor()); if (devnode.empty()) return -EINVAL; -- cgit v1.2.1