diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-17 03:40:28 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-17 03:40:28 +0100 |
| commit | ef9a82038acd73936830671dbe43205c28a2151d (patch) | |
| tree | 90be2cdd9f48750c18b669ca2ab9553575d9f822 /src/gbm/main/gbm.c | |
| parent | f84f60446aebaeee8a1df741328cbd4a30dd24ea (diff) | |
| parent | 743c2327b167b95046e02af4c7b2f7a282a0943d (diff) | |
| download | external_mesa3d-ef9a82038acd73936830671dbe43205c28a2151d.zip external_mesa3d-ef9a82038acd73936830671dbe43205c28a2151d.tar.gz external_mesa3d-ef9a82038acd73936830671dbe43205c28a2151d.tar.bz2 | |
Merge remote-tracking branch 'androidx86/marshmallow-x86' into replicant-6.0replicant-6.0-beta-0001replicant-6.0-alpha-0006replicant-6.0-old
Diffstat (limited to 'src/gbm/main/gbm.c')
| -rw-r--r-- | src/gbm/main/gbm.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c index 0f4657a..c3a2ec33 100644 --- a/src/gbm/main/gbm.c +++ b/src/gbm/main/gbm.c @@ -31,7 +31,12 @@ #include <string.h> #include <stdint.h> -#include <sys/types.h> +#ifdef MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#endif +#ifdef MAJOR_IN_SYSMACROS +#include <sys/sysmacros.h> +#endif #include <sys/stat.h> #include <unistd.h> #include <errno.h> @@ -237,7 +242,8 @@ gbm_bo_get_handle(struct gbm_bo *bo) * descriptor. * \param bo The buffer object - * \return Returns a file descriptor referring to the underlying buffer + * \return Returns a file descriptor referring to the underlying buffer or -1 + * if an error occurs. */ GBM_EXPORT int gbm_bo_get_fd(struct gbm_bo *bo) |