projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
363d0f6
)
i965: Hack in avoidance of c++ reserved keyword in libdrm.
author
Eric Anholt
<eric@anholt.net>
Thu, 26 Aug 2010 22:43:00 +0000
(15:43 -0700)
committer
Eric Anholt
<eric@anholt.net>
Thu, 26 Aug 2010 22:43:36 +0000
(15:43 -0700)
I'm also fixing this upstream in libdrm, but this avoids new libdrm
dependency for the moment.
src/mesa/drivers/dri/i965/brw_fs.cpp
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/i965/brw_fs.cpp
b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 640f797e9e6de20e2b7e6e6c04d50f17a6614466..11c79b11bfc0e97d711b2ab9b057059cc72e6602 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/
src/mesa/drivers/dri/i965/brw_fs.cpp
@@
-26,6
+26,14
@@
*/
extern "C" {
+
+#include <sys/types.h>
+/* Evil hack for using libdrm in a c++ compiler. */
+#define virtual virt
+#include "i915_drm.h"
+#include "intel_bufmgr.h"
+#undef virtual
+
#include "main/macros.h"
#include "main/shaderobj.h"
#include "program/prog_parameter.h"