libcamera: media_object: Rename major/minor functions

The system libraries define macro's for major/minor through
<sys/types.h> 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 <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kieran Bingham
2019-01-08 13:14:29 +00:00
parent 5af15d1931
commit eda3cfa1e3
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -80,8 +80,8 @@ class MediaEntity : public MediaObject
{
public:
const std::string &name() const { return name_; }
unsigned int major() const { return major_; }
unsigned int minor() const { return minor_; }
unsigned int deviceMajor() const { return major_; }
unsigned int deviceMinor() const { return minor_; }
const std::vector<MediaPad *> &pads() const { return pads_; }