diff options
| author | Mark Janes <[email protected]> | 2015-03-04 16:37:29 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2015-03-05 10:21:40 -0800 |
| commit | 237dcb4aa7c39c59bfd225ae3d73caf709be216d (patch) | |
| tree | 9139b596ac2383fa3e4ada351b94000ba9319e5f /src/gallium/drivers/r600/r600_shader.h | |
| parent | 2e4c95dfe2cb205c327ceaa12b44a9273bdb20dc (diff) | |
Fix invalid extern "C" around header inclusion.
System headers may contain C++ declarations, which cannot be given C
linkage. For this reason, include statements should never occur
inside extern "C".
This patch moves the C linkage statements to enclose only the
declarations within a single header.
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_shader.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.h b/src/gallium/drivers/r600/r600_shader.h index b2559e9b661..dd359d7e959 100644 --- a/src/gallium/drivers/r600/r600_shader.h +++ b/src/gallium/drivers/r600/r600_shader.h @@ -25,6 +25,12 @@ #include "r600_asm.h" + +#ifdef __cplusplus +extern "C" { +#endif + + struct r600_shader_io { unsigned name; unsigned gpr; @@ -125,4 +131,10 @@ struct r600_pipe_shader { TGSI_INTERPOLATE_LOC_CENTER/SAMPLE/COUNT. Other input values return -1. */ int eg_get_interpolator_index(unsigned interpolate, unsigned location); + +#ifdef __cplusplus +} // extern "C" +#endif + + #endif |