summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2014-12-15 16:45:57 -0700
committerBrian Paul <[email protected]>2014-12-16 07:52:41 -0700
commitde42431a9d761305c9911f30b5880a9a049a2d60 (patch)
treef1495e14b4f5a2f2e97ed9c67bac91a49bf9f68b /src
parent7b0aefaf74d210f517c54ba5f1c0a6076167869a (diff)
main: remove extern C around #includes in ff_fragment_shader.cpp
Reviewed-by: Anuj Phogat <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/ff_fragment_shader.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index 5591d57df11..bc6fdbdd891 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -27,13 +27,15 @@
*
**************************************************************************/
-extern "C" {
#include "glheader.h"
#include "imports.h"
#include "mtypes.h"
#include "main/context.h"
#include "main/macros.h"
#include "main/samplerobj.h"
+#include "main/texenvprogram.h"
+#include "main/texobj.h"
+#include "main/uniforms.h"
#include "program/program.h"
#include "program/prog_parameter.h"
#include "program/prog_cache.h"
@@ -41,10 +43,6 @@ extern "C" {
#include "program/prog_print.h"
#include "program/prog_statevars.h"
#include "program/programopt.h"
-#include "texenvprogram.h"
-#include "texobj.h"
-}
-#include "main/uniforms.h"
#include "../glsl/glsl_types.h"
#include "../glsl/ir.h"
#include "../glsl/ir_builder.h"