From 3d4597f9d4c93d285825d5a6505d4ee7ce6e2c3e Mon Sep 17 00:00:00 2001 From: Cedric Vivier Date: Sat, 28 Aug 2010 20:01:46 -0700 Subject: [PATCH] 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 file changed, 5 deletions(-) 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 -/* 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" -- 2.30.2