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/mesa/main/tests | |
| 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/mesa/main/tests')
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/main/tests/program_state_string.cpp | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index c14ad32eb3e..d25143faa17 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -41,7 +41,6 @@ #include <gtest/gtest.h> -extern "C" { #include "GL/gl.h" #include "GL/glext.h" #include "main/compiler.h" @@ -62,7 +61,6 @@ extern "C" { #endif #include "main/dispatch.h" -} struct function { const char *name; diff --git a/src/mesa/main/tests/program_state_string.cpp b/src/mesa/main/tests/program_state_string.cpp index 418c39c8ea9..ddfdb49ee2c 100644 --- a/src/mesa/main/tests/program_state_string.cpp +++ b/src/mesa/main/tests/program_state_string.cpp @@ -23,11 +23,9 @@ #include <gtest/gtest.h> -extern "C" { #include "GL/gl.h" #include "GL/glext.h" #include "main/compiler.h" -} #include "program/prog_statevars.h" |