drm: Branch 'master'

 exynos/exynos_drmif.h |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 47521438eb5c3f01c0bbae79c85ddbe8a5435a98
Author: Tobias Jakobi <[email protected]>
Date:   Wed Apr 5 16:22:24 2017 +0200

    exynos: add C++ support to exynos_drmif header
    
    Add the usual extern "C" when compiling in C++ mode.
    
    Signed-off-by: Tobias Jakobi <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>

diff --git a/exynos/exynos_drmif.h b/exynos/exynos_drmif.h
index 626e3998..154439bb 100644
--- a/exynos/exynos_drmif.h
+++ b/exynos/exynos_drmif.h
@@ -31,6 +31,10 @@
 #include <stdint.h>
 #include "exynos_drm.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 struct exynos_device {
 	int fd;
 };
@@ -109,4 +113,8 @@ int exynos_handle_event(struct exynos_device *dev,
 				struct exynos_event_context *ctx);
 
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* EXYNOS_DRMIF_H_ */

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--