diff options
| author | Emil Velikov <[email protected]> | 2017-02-16 15:16:37 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-02-21 18:29:10 +0000 |
| commit | 7fcbb1a902f3e4ce9f4d93d8b628729431f0f6fc (patch) | |
| tree | bc205e73e888c7c4c3a5b544931524992a418df6 | |
| parent | a177a13033cf9356eb26e8757055037a54268a18 (diff) | |
glsl: resolve extern C workarounds/hacks
Do not wrap header inclusion in extern C since it can cause issues.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/compiler/glsl/blob.h | 8 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_symbol_table.h | 2 | ||||
| -rw-r--r-- | 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 0765bf3ef18..81b9917afcf 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 087cc71f639..be910b4170c 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 965e63ade8b..858fe97b4f2 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 |