From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Emil Velikov <emil.l.velikov@gmail.com>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 1/2] drm: Untangle __KERNEL__ guards
Date: Wed, 30 Mar 2016 16:42:22 +0200 [thread overview]
Message-ID: <1459348943-12803-1-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch>
make headers_install can't handle fancy conditions, so let's simplify
things for it a bit.
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
include/uapi/drm/drm.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
index c7ecc3abff03..3b56285a7e2a 100644
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
@@ -36,7 +36,13 @@
#ifndef _DRM_H_
#define _DRM_H_
-#if defined(__KERNEL__) || defined(__linux__)
+#if defined(__KERNEL__)
+
+#include <linux/types.h>
+#include <asm/ioctl.h>
+typedef unsigned int drm_handle_t;
+
+#elif defined(__linux__)
#include <linux/types.h>
#include <asm/ioctl.h>
--
2.8.0.rc3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-03-30 14:42 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 14:19 [PATCH 1/3] drm: Make drm.h uapi header safe for C++ Daniel Vetter
2016-03-30 14:19 ` [PATCH 2/3] drm: align #include directives with libdrm in uapi headers Daniel Vetter
2016-03-30 15:05 ` Emil Velikov
2016-03-30 15:11 ` Daniel Vetter
2016-03-30 15:22 ` Emil Velikov
2016-03-30 15:54 ` [PATCH] " Daniel Vetter
2016-03-30 16:08 ` Emil Velikov
2016-03-30 14:19 ` [PATCH 3/3] drm: Move DRM_MODE_OBJECT_* to " Daniel Vetter
2016-03-30 16:07 ` Emil Velikov
2016-03-30 17:55 ` Paulo Zanoni
2016-03-30 19:07 ` Daniel Vetter
2016-03-30 14:42 ` Daniel Vetter [this message]
2016-03-30 14:42 ` [PATCH 2/2] drm: Make uapi headers C89 pendantic compliant Daniel Vetter
2016-03-30 20:06 ` Emil Velikov
2016-03-31 5:58 ` Daniel Vetter
2016-03-30 15:56 ` [PATCH 1/2] drm: Untangle __KERNEL__ guards Emil Velikov
2016-03-30 19:11 ` Daniel Vetter
2016-03-30 15:12 ` [PATCH] drm: Make drm.h uapi header safe for C++ Daniel Vetter
2016-03-30 15:56 ` Emil Velikov
2016-04-06 15:58 ` [PATCH 1/3] " Gabriel Laskar
2016-04-06 16:35 ` Emil Velikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459348943-12803-1-git-send-email-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.