diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 23:29:07 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 23:29:07 +0000 |
| commit | 87b961d4c60d5356b2660ec1ed451ab0adc2569c (patch) | |
| tree | 0dcf02395adf63e626d9bea0f05f23e0d4a4f060 /third_party | |
| parent | f05c4957883241f49956d594323270db10b72a14 (diff) | |
| download | chromium_src-87b961d4c60d5356b2660ec1ed451ab0adc2569c.zip chromium_src-87b961d4c60d5356b2660ec1ed451ab0adc2569c.tar.gz chromium_src-87b961d4c60d5356b2660ec1ed451ab0adc2569c.tar.bz2 | |
Disabled a pragma in gl.h that gcc does not support.
Fixes a warning treated as error issue when building chromium code that includes gl.h.
TEST=try
BUG=none
Review URL: http://codereview.chromium.org/2722001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/mesa/MesaLib/include/GL/gl.h | 8 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/third_party/mesa/MesaLib/include/GL/gl.h b/third_party/mesa/MesaLib/include/GL/gl.h index 5f8bc2b..70c95a0 100644 --- a/third_party/mesa/MesaLib/include/GL/gl.h +++ b/third_party/mesa/MesaLib/include/GL/gl.h @@ -72,9 +72,11 @@ # define GLAPIENTRY #endif /* WIN32 && !CYGWIN */ -#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) -# define PRAGMA_EXPORT_SUPPORTED 1 -#endif +// Disabled this because __QUICKDRAW__ is defined on Mac and gcc does not +// support the pragma. +//#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) +//# define PRAGMA_EXPORT_SUPPORTED 1 +//#endif /* * WINDOWS: Include windows.h here to define APIENTRY. diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index 51652b6..15efc64 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -25,3 +25,8 @@ Later modifications: - Changed these typedefs in glext.h to be the same as khrplatform.h
typedef signed long int GLintptr; typedef signed long int GLsizeiptr; + +- Commented out this in gl.h: +#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) +# define PRAGMA_EXPORT_SUPPORTED 1 +#endif |