diff options
| author | Cedric Vivier <[email protected]> | 2010-08-30 10:40:39 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2010-08-30 10:42:20 -0700 |
| commit | e1aa3c234fcc30c5c07f4b896adf304414558604 (patch) | |
| tree | 0f1c12561468f3bd7b8d8e9c8b08203092348abf /src/mesa | |
| parent | 1fcb5a9858b7513c5130006933edc224b69be82d (diff) | |
i965: Apply the rest of the old-libdrm guard patch.
Bug #29855
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index f245ba843bd..28d53284fdf 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -33,12 +33,25 @@ #include "main/mtypes.h" #include "main/mm.h" #include "dri_metaops.h" + +#ifdef __cplusplus +extern "C" { + /* Evil hack for using libdrm in a c++ compiler. */ + #define virtual virt +#endif + #include "drm.h" #include "intel_bufmgr.h" #include "intel_screen.h" #include "intel_tex_obj.h" #include "i915_drm.h" + +#ifdef __cplusplus + #undef virtual +} +#endif + #include "tnl/t_vertex.h" #define TAG(x) intel##x |