drm: Branch 'master'

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

New commits:
commit 41be41f99eb53bd4998b1cd930fa63f0e552d971
Author: Nicolai Hähnle <[email protected]>
Date:   Sat May 13 23:03:55 2017 +0200

    amdgpu: add missing extern "C" headers
    
    Signed-off-by: Nicolai Hähnle <[email protected]>
    Reviewed-by: Michel Dänzer <[email protected]>
    Reviewed-by: Alex Xie <[email protected]>

diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h
index fdea9050..1901fa8c 100644
--- a/amdgpu/amdgpu.h
+++ b/amdgpu/amdgpu.h
@@ -37,6 +37,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct drm_amdgpu_info_hw_ip;
 
 /*--------------------------------------------------------------------------*/
@@ -1324,4 +1328,8 @@ int amdgpu_cs_destroy_semaphore(amdgpu_semaphore_handle sem);
 */
 const char *amdgpu_get_marketing_name(amdgpu_device_handle dev);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* #ifdef _AMDGPU_H_ */

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

--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches