diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
| commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
| tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/llcommon/llhash.h | |
| parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) | |
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
Diffstat (limited to 'indra/llcommon/llhash.h')
| -rw-r--r-- | indra/llcommon/llhash.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llhash.h b/indra/llcommon/llhash.h index f4b05869a4..08299f5ddc 100644 --- a/indra/llcommon/llhash.h +++ b/indra/llcommon/llhash.h @@ -38,7 +38,9 @@ #include <hash_map> #include <algorithm> #elif LL_DARWIN || LL_LINUX -# if GCC_VERSION >= 30400 // gcc 3.4 and up +# if GCC_VERSION >= 40300 // gcc 4.3 and up +# include <backward/hashtable.h> +# elif GCC_VERSION >= 30400 // gcc 3.4 and up # include <ext/hashtable.h> # elif __GNUC__ >= 3 # include <ext/stl_hashtable.h> |