commit c8eff1c1e1b88b98b2cf1fa52efbac487f4a747c
author Austin Eng <enga@chromium.org> Mon Mar 04 23:41:28 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon Mar 04 23:41:28 2019 +0000
tree b43c5566248c9565e3708fee7b91920c21ac970c
parent 081d5c2f64802b02f7b20580a990fdfb8de9605b

Remove export of GLVersion from GLAD

This symbol conflicts with a duplicate symbol when we link Dawn into
Chromium on Linux.

Bug: chromium:877147
Change-Id: Iadf8ac81760085a04d82ea9116e367a1bd17cd4d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/5260
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

third_party/glad/include/glad/glad.h

diff --git a/third_party/glad/include/glad/glad.h b/third_party/glad/include/glad/glad.h
index 46e8798..2825675 100644
--- a/third_party/glad/include/glad/glad.h
+++ b/third_party/glad/include/glad/glad.h
@@ -7,7 +7,7 @@
     APIs: gl=4.5
     Profile: core
     Extensions:
-        
+
     Loader: True
     Local files: False
     Omit khrplatform: False
@@ -81,7 +81,7 @@
 # endif
 #endif
 
-GLAPI struct gladGLversionStruct GLVersion;
+extern struct gladGLversionStruct GLVersion;
 
 GLAPI int gladLoadGL(void);