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

diff --git a/src/gallium/drivers/i915simple/SConscript b/src/gallium/drivers/i915simple/SConscript
index f5fb96b995c8bf3dc2c5fda3b6a5a5971dae5f32..3e1beaea6d879938c9f094ccc4ecf47d8fbd0b13 100644 (file)
--- a/src/gallium/drivers/i915simple/SConscript
+++ b/src/gallium/drivers/i915simple/SConscript
@@ -15,6 +15,7 @@ i915simple = env.ConvenienceLibrary(
                'i915_fpc_translate.c',
                'i915_prim_emit.c',
                'i915_prim_vbuf.c',
+               'i915_screen.c',
                'i915_state.c',
                'i915_state_derived.c',
                'i915_state_dynamic.c',

diff --git a/src/gallium/drivers/i915simple/i915_screen.c b/src/gallium/drivers/i915simple/i915_screen.c
index 7e9d971d384463bef25942dc0ed2b7864dbc6167..5630440a5ac385df47129e97a33159bae00b4ece 100644 (file)
--- a/src/gallium/drivers/i915simple/i915_screen.c
+++ b/src/gallium/drivers/i915simple/i915_screen.c
@@ -30,6 +30,7 @@
 #include "pipe/p_winsys.h"
 
 #include "i915_reg.h"
+#include "i915_context.h"
 #include "i915_screen.h"
 #include "i915_texture.h"
 

diff --git a/src/gallium/drivers/i915simple/i915_screen.h b/src/gallium/drivers/i915simple/i915_screen.h
index 8394ddbe8962144f283c388cb41ebb3cbf28a9af..73b0ff05ce7df76859ac5013ffc2dd085e98e1ba 100644 (file)
--- a/src/gallium/drivers/i915simple/i915_screen.h
+++ b/src/gallium/drivers/i915simple/i915_screen.h
@@ -33,6 +33,11 @@
 #include "pipe/p_screen.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /**
  * Subclass of pipe_screen
  */
@@ -57,4 +62,8 @@ extern struct pipe_screen *
 i915_create_screen(struct pipe_winsys *winsys, uint pci_id);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* I915_SCREEN_H */

diff --git a/src/gallium/drivers/i915simple/i915_winsys.h b/src/gallium/drivers/i915simple/i915_winsys.h
index e6b0ac9c52ef63c64247c2bc4aa91f6bff593ba4..aea300328180aa5edafe11078989bb40926f78d3 100644 (file)
--- 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