From: Cedric Vivier <cedricv@neonux.com>
Date: Sun, 29 Aug 2010 03:01:46 +0000 (-0700)
Subject: i965: Move libdrm/C++ hack introduced in fa2deb3d to intel_context.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d4597f9d4c93d285825d5a6505d4ee7ce6e2c3e;p=mesa.git

i965: Move libdrm/C++ hack introduced in fa2deb3d to intel_context.h

Fixes build on Linux/GCC 4.4 as libdrm includes are also used by other
brw_fs_*.cpp files.

Bug #29855
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 63eae840c27..ede1848520a 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -28,11 +28,6 @@
 extern "C" {
 
 #include <sys/types.h>
-/* Evil hack for using libdrm in a c++ compiler. */
-#define virtual virt
-#include "i915_drm.h"
-#include "intel_bufmgr.h"
-#undef virtual
 
 #include "main/macros.h"
 #include "main/shaderobj.h"