gallium: update for new i915_screen.c file; fix some warnings.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/gallium/drivers/i915simple/i915_winsys.h b/src/gallium/drivers/i915simple/i915_winsys.h
index e6b0ac9c52e..aea30032818 100644
--- a/src/gallium/drivers/i915simple/i915_winsys.h
+++ b/src/gallium/drivers/i915simple/i915_winsys.h
@@ -40,6 +40,11 @@
 #include "pipe/p_defines.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+   
 /* Pipe drivers are (meant to be!) independent of both GL and the
  * window system.  The window system provides a buffer manager and a
  * set of additional hooks for things like command buffer submission,
@@ -112,4 +117,8 @@ struct pipe_context *i915_create_context( struct pipe_screen *,
                                           struct pipe_winsys *,
                                           struct i915_winsys * );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif