i965: remove 'virtual' and extern C workarounds
The headers are properly annotated thus we don't need these. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
parent
8481914681
commit
3ea07d2be9
|
@ -43,26 +43,16 @@
|
||||||
#include "isl/isl.h"
|
#include "isl/isl.h"
|
||||||
#include "blorp/blorp.h"
|
#include "blorp/blorp.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
/* Evil hack for using libdrm in a c++ compiler. */
|
|
||||||
#define virtual virt
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <intel_bufmgr.h>
|
#include <intel_bufmgr.h>
|
||||||
#ifdef __cplusplus
|
|
||||||
#undef virtual
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
#include "intel_debug.h"
|
#include "intel_debug.h"
|
||||||
#include "intel_screen.h"
|
#include "intel_screen.h"
|
||||||
#include "intel_tex_obj.h"
|
#include "intel_tex_obj.h"
|
||||||
#include "intel_resolve_map.h"
|
#include "intel_resolve_map.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
/* Glossary:
|
/* Glossary:
|
||||||
*
|
*
|
||||||
* URB - uniform resource buffer. A mid-sized buffer which is
|
* URB - uniform resource buffer. A mid-sized buffer which is
|
||||||
|
|
Loading…
Reference in New Issue