commit e70a8ff30d20e1bf6bb5c06b5cd7bd4ea9ae20e1
author Ben Murdoch <benm@google.com> Thu Apr 24 10:50:44 2014 +0100
committer Ben Murdoch <benm@google.com> Thu Apr 24 10:50:44 2014 +0100
tree d16def297212b6d607566de1981277159210b3ac
parent c7fd8ad396558ae2fc23840b0583408c0a6a63d1
parent 2042c05277e80a12868d714e082b94f8d6cb59a5

Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: Ia490b10625692bf8dedb2a1d67598f1225b48225

include/GL/gl.h

diff --git a/include/GL/gl.h b/include/GL/gl.h
index e65e1bc..60518d2 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -72,7 +72,8 @@
 #  define GLAPIENTRY
 #endif /* WIN32 && !CYGWIN */
 
-#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
+/* See https://bugs.freedesktop.org/show_bug.cgi?id=77749 */
+#if (defined(__BEOS__) && defined(__POWERPC__)) /* || defined(__QUICKDRAW__) */
 #  define PRAGMA_EXPORT_SUPPORTED		1
 #endif
 

include/GL/osmesa.h

diff --git a/include/GL/osmesa.h b/include/GL/osmesa.h
index 304655e..211226e 100644
--- a/include/GL/osmesa.h
+++ b/include/GL/osmesa.h
@@ -101,7 +101,8 @@
 typedef struct osmesa_context *OSMesaContext;
 
 
-#if defined(__QUICKDRAW__)
+/* See https://bugs.freedesktop.org/show_bug.cgi?id=77749 */
+#if 0 /* defined(__QUICKDRAW__) */
 #pragma export on
 #endif