diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 16:38:40 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 16:38:40 +0000 |
| commit | 457812d99a213dedf1c4cd38018ff48118d0c44f (patch) | |
| tree | d16def297212b6d607566de1981277159210b3ac | |
| parent | 66c1c789ce3407472de9ed620c9f815639058835 (diff) | |
| download | src-457812d99a213dedf1c4cd38018ff48118d0c44f.tar.gz | |
mesa: Disable use of "pragma export" on OS X. clang doesn't understand it.
Filed upstream as crbug.com/365682 . The motivation is to let mesa no longer
push -Wno-unknown-pragmas to all targets that depend on mesa.
We used to have this change, but https://codereview.chromium.org/17005007 lost
it.
BUG=338759
R=dpranke@chromium.org
Review URL: https://codereview.chromium.org/246843006
git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@265279 0039d316-1c4b-4281-b951-d872f2087c98
| -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 |