Mesa (master): i965: Move libdrm/ C++ hack introduced in fa2deb3d to intel_context.h

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 3d4597f9d4c93d285825d5a6505d4ee7ce6e2c3e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d4597f9d4c93d285825d5a6505d4ee7ce6e2c3e

Author: Cedric Vivier <cedricv at neonux.com>
Date:   Sat Aug 28 20:01:46 2010 -0700

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

---

 src/mesa/drivers/dri/i965/brw_fs.cpp |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 63eae84..ede1848 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"