diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-02-16 15:16:42 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-02-21 18:29:41 +0000 |
| commit | 0e74f390d9ed1125321fa2fab4da629a521baede (patch) | |
| tree | 3143d654c3b1e20db491856f21d0e71129beddd5 /src/mesa/drivers/dri/i915 | |
| parent | 3ea07d2be9350bcf31c7ef3ec46bfcd5d7765350 (diff) | |
i915: remove 'virtual' and extern C workarounds
Analogous to previous commit.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index 58321698256..139a0337772 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -34,18 +34,9 @@ #include "main/mtypes.h" #include "main/mm.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 <i915_drm.h> -#ifdef __cplusplus - #undef virtual -#endif #include "intel_screen.h" #include "intel_tex_obj.h" @@ -56,6 +47,10 @@ extern "C" { #include "tnl_dd/t_dd_vertex.h" #undef TAG +#ifdef __cplusplus +extern "C" { +#endif + #define DV_PF_555 (1<<8) #define DV_PF_565 (2<<8) #define DV_PF_8888 (3<<8) |