summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Janes <[email protected]>2015-03-06 13:36:54 -0800
committerIlia Mirkin <[email protected]>2015-03-06 22:08:11 -0500
commitc4b91a1f5c7ef667708a6b8d734707bbba851437 (patch)
treee298114e0505a42880101184e6940e1bb4e7fbde
parent20346808cf4f1ee4f320afaf18f94043fb146f2e (diff)
nouveau: Fix build, invalid extern "C" around header inclusion.
A previous patch to fix header inclusion within extern "C" neglected to fix the occurences of this pattern in nouveau files. When the helper to detect this issue was pushed to master, it broke the build for the nouveau driver. This patch fixes the nouveau build. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89477 Reviewed-by: Ilia Mirkin <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_scan.h7
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 5dc9267b8d2..0ea0e8846be 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -33,6 +33,10 @@
#include "pipe/p_state.h"
#include "pipe/p_shader_tokens.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* Shader summary info
*/
@@ -114,5 +118,8 @@ tgsi_scan_shader(const struct tgsi_token *tokens,
extern boolean
tgsi_is_passthrough_shader(const struct tgsi_token *tokens);
+#ifdef __cplusplus
+} // extern "C"
+#endif
#endif /* TGSI_SCAN_H */
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
index 6e75730bb3e..1e0a6952dd0 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
@@ -20,11 +20,9 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-extern "C" {
#include "tgsi/tgsi_dump.h"
#include "tgsi/tgsi_scan.h"
#include "tgsi/tgsi_util.h"
-}
#include <set>