diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-26 20:43:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-26 20:43:37 +0800 |
| commit | 591ecf748a620f7528d498e576271a33df5366ee (patch) | |
| tree | 28c190f398df43c30d1f1bcf629aa0853d3fec19 /indra/llrender | |
| parent | 36ef523abbe27165b89608c5380d8e36719bc162 (diff) | |
Remove double macro conditions in GL headers
I just noticed LL_LINUX got its own scope just below LL_MESA.
We're minimising difference from upstream Maintenance-B.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglheaders.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 0b3258c105..0e278e1744 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -27,7 +27,7 @@ #ifndef LL_LLGLHEADERS_H #define LL_LLGLHEADERS_H -#if LL_MESA || LL_LINUX || __FreeBSD__ +#if LL_MESA //---------------------------------------------------------------------------- // MESA headers // quotes so we get libraries/.../GL/ version @@ -41,7 +41,7 @@ # include "GL/glh_extensions.h" # undef __APPLE__ -#elif LL_LINUX +#elif LL_LINUX || __FreeBSD__ #define GL_GLEXT_PROTOTYPES #define GLX_GLEXT_PROTOTYPES |