diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
| commit | d373dcc7cbed5fdea72c6b71a5594e4e85549b43 (patch) | |
| tree | 140e20f48db5dc4d7842f05ef2c24ef9e6fc3238 /indra/llcommon/timing.h | |
| parent | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (diff) | |
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
Diffstat (limited to 'indra/llcommon/timing.h')
| -rw-r--r-- | indra/llcommon/timing.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/timing.h b/indra/llcommon/timing.h index f09fb0f92b..8952bc3b52 100644 --- a/indra/llcommon/timing.h +++ b/indra/llcommon/timing.h @@ -11,7 +11,7 @@ #include <time.h> -#if LL_LINUX || LL_DARWIN +#if LL_LINUX || LL_DARWIN || LL_SOLARIS # include <sys/time.h> #endif |