diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:44 +0100 |
| commit | e70a8ff30d20e1bf6bb5c06b5cd7bd4ea9ae20e1 (patch) | |
| tree | d16def297212b6d607566de1981277159210b3ac | |
| parent | c7fd8ad396558ae2fc23840b0583408c0a6a63d1 (diff) | |
| parent | 2042c05277e80a12868d714e082b94f8d6cb59a5 (diff) | |
| download | src-lollipop-mr1-cts-release.tar.gz | |
Merge from Chromium at DEPS revision 265802android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewidea133-weekly-release
This commit was generated by merge_to_master.py.
Change-Id: Ia490b10625692bf8dedb2a1d67598f1225b48225
| -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 |