diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-31 15:14:08 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-31 15:14:08 +0800 |
| commit | 0379e9e8e50aeaae7eadb4afa36df7de48b50edf (patch) | |
| tree | b0fdb041bc66f1d6dc9c572119eb2ca078119f95 /indra/llrender | |
| parent | 50a2036f02abaf23923618cc9a94048fd65f1acc (diff) | |
Revert "Remove double macro conditions in GL headers"
This reverts commit 591ecf748a620f7528d498e576271a33df5366ee.
Unnecessarily including GLX headers in llglheaders.h would cause
a conflict with some Boost 1.81 JSON header on Debian bookworm.
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 0e278e1744..0b3258c105 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 +#if LL_MESA || LL_LINUX || __FreeBSD__ //---------------------------------------------------------------------------- // MESA headers // quotes so we get libraries/.../GL/ version @@ -41,7 +41,7 @@ # include "GL/glh_extensions.h" # undef __APPLE__ -#elif LL_LINUX || __FreeBSD__ +#elif LL_LINUX #define GL_GLEXT_PROTOTYPES #define GLX_GLEXT_PROTOTYPES |