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/media_object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libcamera/media_object.cpp') diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp index 581e1c08..06a8d642 100644 --- a/src/libcamera/media_object.cpp +++ b/src/libcamera/media_object.cpp @@ -212,14 +212,14 @@ void MediaPad::addLink(MediaLink *link) */ /** - * \fn MediaEntity::major() + * \fn MediaEntity::deviceMajor() * \brief Retrieve the major number of the interface associated with the entity * \return The interface major number, or 0 if the entity isn't associated with * an interface */ /** - * \fn MediaEntity::minor() + * \fn MediaEntity::deviceMinor() * \brief Retrieve the minor number of the interface associated with the entity * \return The interface minor number, or 0 if the entity isn't associated with * an interface -- cgit v1.2.1