summaryrefslogtreecommitdiff
path: root/src/gallium/include/pipe/p_state.h
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-02-27 00:34:31 +1100
committerBen Skeggs <skeggsb@gmail.com>2008-02-27 00:34:31 +1100
commit68ef52886263690632552ae187a4673945c2ab74 (patch)
tree0453c0063397c196ebe5e3dcd4d9c91392496d77 /src/gallium/include/pipe/p_state.h
parent026e2fd3c6eb87a010a9c90341e8a77b09376b5b (diff)
parentad6bb870de6103ed240fa1f9f828bd13a4401a9a (diff)
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/include/pipe/p_state.h')
-rw-r--r--src/gallium/include/pipe/p_state.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 47fa78c31d..15c88881eb 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -42,6 +42,12 @@
#include "p_defines.h"
#include "p_format.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
/**
* Implementation limits
*/
@@ -326,4 +332,8 @@ struct pipe_vertex_element
};
+#ifdef __cplusplus
+}
+#endif
+
#endif