Merge branch 'gallium-i915-current' into gallium-0.1

[mesa.git] / src / gallium / drivers / softpipe / sp_winsys.h

diff --git a/src/gallium/drivers/softpipe/sp_winsys.h b/src/gallium/drivers/softpipe/sp_winsys.h
index 80f535480817df6ff7286fcaa4b892457683473b..4ab666486c499769e5f9df65005390fa96da19ea 100644 (file)
--- 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 {
@@ -46,17 +52,22 @@ struct softpipe_winsys {
 
 };
 
+struct pipe_screen;
 struct pipe_winsys;
 struct pipe_context;
 
 
 struct pipe_context *softpipe_create( struct pipe_screen *,
                                       struct pipe_winsys *,
-                                     struct softpipe_winsys * );
+                                     void *unused );
 
 
 struct pipe_screen *
 softpipe_create_screen(struct pipe_winsys *);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SP_WINSYS_H */