PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: media_object: Rename major/minor functions

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/device_enumerator.cpp
+2 -2
View File
@@ -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;