From: Emil Velikov <emil.velikov@collabora.com>
Date: Tue, 24 Nov 2015 16:29:23 +0000 (+0000)
Subject: i915: limit extern "C" hack only for libdrm headers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5351dc1522bc2b647bbe3dd09ec2c8e77608b3c7;p=mesa.git

i915: limit extern "C" hack only for libdrm headers

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index aecd7c23f45..39b328a3f3e 100644
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -40,17 +40,16 @@ extern "C" {
 	#define virtual virt
 #endif
 
-#include "drm.h"
-#include "intel_bufmgr.h"
-
-#include "intel_screen.h"
-#include "intel_tex_obj.h"
-#include "i915_drm.h"
-
+#include <drm.h>
+#include <intel_bufmgr.h>
+#include <i915_drm.h>
 #ifdef __cplusplus
 	#undef virtual
 #endif
 
+#include "intel_screen.h"
+#include "intel_tex_obj.h"
+
 #include "tnl/t_vertex.h"
 
 #define TAG(x) intel##x