diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-11 01:34:13 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-11 01:34:13 +0300 |
| commit | 9406b757a36d409e93a0ccde0a1fea289a3e6118 (patch) | |
| tree | bac8ea172ccf40ea836d1b750d73e5d2cc5e11e4 /indra/llcommon/llstl.h | |
| parent | f554fe2ca74ddf275e47cdce8537e04ab40f9f95 (diff) | |
| parent | 2e66c406d1767f26f968452e9ca5f5c0afa513b2 (diff) | |
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
Diffstat (limited to 'indra/llcommon/llstl.h')
| -rw-r--r-- | indra/llcommon/llstl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h index b024b47225..a90c2c7e08 100644 --- a/indra/llcommon/llstl.h +++ b/indra/llcommon/llstl.h @@ -36,6 +36,10 @@ #include <set> #include <typeinfo> +#ifdef LL_LINUX +// <ND> For strcmp +#include <string.h> +#endif // Use to compare the first element only of a pair // e.g. typedef std::set<std::pair<int, Data*>, compare_pair<int, Data*> > some_pair_set_t; template <typename T1, typename T2> |