diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-12 13:22:58 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-12 13:22:58 -0700 |
| commit | 4a1ef20c317897e7e509c7f599e97fcc90ffaefc (patch) | |
| tree | c496bd8785b94bb60bca33ea59758c5929341451 /indra/llcommon/llstringtable.h | |
| parent | 895e8ad446ab383e1211f759e8b55aa0fff2efc1 (diff) | |
| parent | d4b2897700c66354413af42ab055bd1aaa47f91c (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llstringtable.h')
| -rw-r--r-- | indra/llcommon/llstringtable.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h index 888361b0b9..5c4831cc2b 100644 --- a/indra/llcommon/llstringtable.h +++ b/indra/llcommon/llstringtable.h @@ -48,10 +48,12 @@ //# define STRING_TABLE_HASH_MAP 1 #endif -#if LL_WINDOWS -#include <hash_map> -#else -#include <ext/hash_map> +#if STRING_TABLE_HASH_MAP +# if LL_WINDOWS +# include <hash_map> +# else +# include <ext/hash_map> +# endif #endif const U32 MAX_STRINGS_LENGTH = 256; |