third_party/khronos/GLES2/gl2platform.h - Issue 9150022: Revert r118525 / Re-land r118240 - the build failure was a flake.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/khronos/GLES2/gl2platform.h

Issue 9150022: Revert r118525 / Re-land r118240 - the build failure was a flake. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/khronos/GLES2/gl2platform.h

diff --git a/third_party/khronos/GLES2/gl2platform.h b/third_party/khronos/GLES2/gl2platform.h

index c9fa3c4d64bd2f4fa702ba1405e597012790bb10..f1c85208147dd61b1e4fb8c8abd0bec360b67910 100644

--- a/third_party/khronos/GLES2/gl2platform.h

+++ b/third_party/khronos/GLES2/gl2platform.h

@@ -19,8 +19,18 @@

#include <KHR/khrplatform.h>

-#ifndef GL_APICALL

-#define GL_APICALL KHRONOS_APICALL

+#if defined(COMPONENT_BUILD)

+#if defined(WIN32)

+#if defined(GLES2_C_LIB_IMPLEMENTATION)

+#define GL_APICALL __declspec(dllexport)

+#else

+#define GL_APICALL __declspec(dllimport)

+#endif /* defined(GLES2_C_LIB_IMPLEMENTATION) */

+#else /* defined(WIN32) */

+#define GL_APICALL __attribute__((visibility("default")))

+#endif

+#else

+# define GL_APICALL

#endif

#ifndef GL_APIENTRY

« no previous file with comments | « third_party/khronos/GLES2/gl2ext.h ('k') | webkit/gpu/webkit_gpu.gypi » ('j') | no next file with comments »