diff options
| author | Brian Paul <brianp@vmware.com> | 2014-12-15 17:04:38 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-12-16 07:52:41 -0700 |
| commit | 6d2f59fd94432a31a65797c19b98ea04296909c9 (patch) | |
| tree | b353b7b6a6ebd846113a56a0386d24968db4f1ad /src/mesa/program | |
| parent | 241c599cb109d022ab44aa84ad823ca7a13b32fa (diff) | |
| download | external_mesa3d-6d2f59fd94432a31a65797c19b98ea04296909c9.zip external_mesa3d-6d2f59fd94432a31a65797c19b98ea04296909c9.tar.gz external_mesa3d-6d2f59fd94432a31a65797c19b98ea04296909c9.tar.bz2 | |
program: remove extern "C" around #includes
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 7 |
1 files 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); |