diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-23 01:59:07 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-23 01:59:07 +0000 |
| commit | 2042c05277e80a12868d714e082b94f8d6cb59a5 (patch) | |
| tree | d16def297212b6d607566de1981277159210b3ac | |
| parent | ea82f8995efee1140d2a096b10786f547327bb3c (diff) | |
| parent | 457812d99a213dedf1c4cd38018ff48118d0c44f (diff) | |
| download | src-2042c05277e80a12868d714e082b94f8d6cb59a5.tar.gz | |
Merge third_party/mesa/src from https://chromium.googlesource.com/chromium/deps/mesa.git at 457812d99a213dedf1c4cd38018ff48118d0c44f
This commit was generated by merge_from_chromium.py.
Change-Id: Ic73859c9d93f627c52d45a4df087a250a9bd261b
| -rw-r--r-- | include/GL/gl.h | 3 | ||||
| -rw-r--r-- | include/GL/osmesa.h | 3 |
2 files changed, 4 insertions, 2 deletions
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 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 @@ extern "C" { 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 |