Mesa (master): program: remove extern "C" around #includes
Brian Paul
brianp at kemper.freedesktop.org
Tue Dec 16 15:51:40 UTC 2014
Module: Mesa
Branch: master
Commit: 6d2f59fd94432a31a65797c19b98ea04296909c9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d2f59fd94432a31a65797c19b98ea04296909c9
Author: Brian Paul <brianp at vmware.com>
Date: Mon Dec 15 17:04:38 2014 -0700
program: remove extern "C" around #includes
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
---
src/mesa/program/ir_to_mesa.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 5196545..ce3af31 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -43,19 +43,18 @@
#include "linker.h"
#include "main/mtypes.h"
+#include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
-#include "program/hash_table.h"
-extern "C" {
-#include "main/shaderapi.h"
+#include "program/hash_table.h"
#include "program/prog_instruction.h"
#include "program/prog_optimize.h"
#include "program/prog_print.h"
#include "program/program.h"
#include "program/prog_parameter.h"
#include "program/sampler.h"
-}
+
static int swizzle_for_size(int size);
More information about the mesa-commit
mailing list