summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2008-03-25 12:14:49 +1100
committerBen Skeggs <[email protected]>2008-03-25 12:14:49 +1100
commit9e1f7b2c57154704d5881362a44da703b7a4a00f (patch)
tree9cd0ca55f1eb9a0908ae76f65cfda107a7aec0ca /src/gallium/drivers
parent601b018a9a6143c634239d5bb51616724c2e593d (diff)
parent4654803e2595ea041ea83baf5e13e6c68890e9a7 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/softpipe/sp_winsys.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gallium/drivers/softpipe/sp_winsys.h b/src/gallium/drivers/softpipe/sp_winsys.h
index fc372dba27b..291825dfe22 100644
--- a/src/gallium/drivers/softpipe/sp_winsys.h
+++ b/src/gallium/drivers/softpipe/sp_winsys.h
@@ -37,6 +37,12 @@
#include "pipe/p_compiler.h" /* for boolean */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
enum pipe_format;
struct softpipe_winsys {
@@ -60,4 +66,8 @@ struct pipe_screen *
softpipe_create_screen(struct pipe_winsys *);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* SP_WINSYS_H */