OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1fcb5a9
)
i965: Apply the rest of the old-libdrm guard patch.
author
Cedric Vivier
<cedricv@neonux.com>
Mon, 30 Aug 2010 17:40:39 +0000
(10:40 -0700)
committer
Eric Anholt
<eric@anholt.net>
Mon, 30 Aug 2010 17:42:20 +0000
(10:42 -0700)
Bug #29855
src/mesa/drivers/dri/intel/intel_context.h
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/intel/intel_context.h
b/src/mesa/drivers/dri/intel/intel_context.h
index
f245ba8
..
28d5328
100644
(file)
--- 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