summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Vivier <cedricv@neonux.com>2010-08-28 20:01:46 -0700
committerEric Anholt <eric@anholt.net>2010-08-28 20:02:54 -0700
commit3d4597f9d4c93d285825d5a6505d4ee7ce6e2c3e (patch)
tree9b7d09b689dcbd2cb7a93f057169b404ed86f9fc
parent2dfd348e33f0152e3ab693ec3b53911331f5c349 (diff)
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
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp5
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 63eae840c2..ede1848520 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"