diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-27 00:34:31 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-27 00:34:31 +1100 |
| commit | 68ef52886263690632552ae187a4673945c2ab74 (patch) | |
| tree | 0453c0063397c196ebe5e3dcd4d9c91392496d77 /src/gallium/include/pipe/p_inlines.h | |
| parent | 026e2fd3c6eb87a010a9c90341e8a77b09376b5b (diff) | |
| parent | ad6bb870de6103ed240fa1f9f828bd13a4401a9a (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/include/pipe/p_inlines.h')
| -rw-r--r-- | src/gallium/include/pipe/p_inlines.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_inlines.h b/src/gallium/include/pipe/p_inlines.h index ebf6ed86bc..de3fa555c5 100644 --- a/src/gallium/include/pipe/p_inlines.h +++ b/src/gallium/include/pipe/p_inlines.h @@ -33,6 +33,11 @@ #include "p_winsys.h" +#ifdef __cplusplus +extern "C" { +#endif + + static INLINE void * pipe_surface_map(struct pipe_surface *surface) { @@ -109,4 +114,8 @@ pipe_texture_reference(struct pipe_context *pipe, struct pipe_texture **ptr, } +#ifdef __cplusplus +} +#endif + #endif /* P_INLINES_H */ |