From: Emil Velikov <emil.veli...@collabora.com> Do not wrap header inclusion in extern C since it can cause issues.
Signed-off-by: Emil Velikov <emil.veli...@collabora.com> --- src/compiler/glsl/blob.h | 8 ++++---- src/compiler/glsl/glsl_symbol_table.h | 2 -- src/compiler/glsl/ir_print_visitor.h | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/compiler/glsl/blob.h b/src/compiler/glsl/blob.h index 0765bf3ef1..81b9917afc 100644 --- a/src/compiler/glsl/blob.h +++ b/src/compiler/glsl/blob.h @@ -25,14 +25,14 @@ #ifndef BLOB_H #define BLOB_H -#ifdef __cplusplus -extern "C" { -#endif - #include <stdbool.h> #include <stddef.h> #include <stdint.h> +#ifdef __cplusplus +extern "C" { +#endif + /* The blob functions implement a simple, low-level API for serializing and * deserializing. * diff --git a/src/compiler/glsl/glsl_symbol_table.h b/src/compiler/glsl/glsl_symbol_table.h index 087cc71f63..be910b4170 100644 --- a/src/compiler/glsl/glsl_symbol_table.h +++ b/src/compiler/glsl/glsl_symbol_table.h @@ -28,9 +28,7 @@ #include <new> -extern "C" { #include "program/symbol_table.h" -} #include "ir.h" class symbol_table_entry; diff --git a/src/compiler/glsl/ir_print_visitor.h b/src/compiler/glsl/ir_print_visitor.h index 965e63ade8..858fe97b4f 100644 --- a/src/compiler/glsl/ir_print_visitor.h +++ b/src/compiler/glsl/ir_print_visitor.h @@ -29,9 +29,7 @@ #include "ir.h" #include "ir_visitor.h" -extern "C" { #include "program/symbol_table.h" -} /** * Abstract base class of visitors of IR instruction trees -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev