[PATCH libdrm] xf86drm: fix return type for drmIsMaster()

From: Eric Engestrom <eric.engestrom@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: Christopher James Halse Rogers
	<christopher.halse.rogers@canonical.com>,
	Emil Velikov <emil.velikov@collabora.com>
Subject: [PATCH libdrm] xf86drm: fix return type for drmIsMaster()
Date: Fri,  8 Feb 2019 15:02:07 +0000	[thread overview]
Message-ID: <20190208150207.25237-1-eric.engestrom@intel.com> (raw)

Xserver has struct members named `bool`, which means the last commit
breaks its build with errors like this:

  error: two or more data types in declaration specifiers
  Bool bool;
       ^

Fix this by making it return a 0/1 integer, with the same semantic as
the boolean it was before.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=109587
Fixes: 17dfe3ac93217b43f93b "xf86drm: Add drmIsMaster()"
Cc: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Cc: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
 xf86drm.c | 2 +-
 xf86drm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xf86drm.c b/xf86drm.c
index 54695fcd5d1967574b00..05331c6d15bdd15b4be5 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -2724,7 +2724,7 @@ drm_public int drmDropMaster(int fd)
         return drmIoctl(fd, DRM_IOCTL_DROP_MASTER, NULL);
 }
 
-drm_public bool drmIsMaster(int fd)
+drm_public int drmIsMaster(int fd)
 {
         /* Detect master by attempting something that requires master.
          *
diff --git a/xf86drm.h b/xf86drm.h
index b31ec9b5673a717bd6f3..9666a12c36bf28996157 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -746,7 +746,7 @@ extern void drmMsg(const char *format, ...) DRM_PRINTFLIKE(1, 2);
 
 extern int drmSetMaster(int fd);
 extern int drmDropMaster(int fd);
-extern bool drmIsMaster(int fd);
+extern int drmIsMaster(int fd);
 
 #define DRM_EVENT_CONTEXT_VERSION 4
 
-- 
Cheers,
  Eric

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
