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>
This commit is contained in:
parent
3ea07d2be9
commit
0e74f390d9
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue