summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2017-02-16 15:16:37 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2017-02-21 18:29:10 +0000
commit7fcbb1a902f3e4ce9f4d93d8b628729431f0f6fc (patch)
treebc205e73e888c7c4c3a5b544931524992a418df6 /src
parenta177a13033cf9356eb26e8757055037a54268a18 (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 <emil.velikov@collabora.com> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src')
-rw-r--r--src/compiler/glsl/blob.h8
-rw-r--r--src/compiler/glsl/glsl_symbol_table.h2
-rw-r--r--src/compiler/glsl/ir_print_visitor.h2
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