aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llfasttimer.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/llcommon/llfasttimer.cpp
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/llcommon/llfasttimer.cpp')
-rw-r--r--linden/indra/llcommon/llfasttimer.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/llcommon/llfasttimer.cpp b/linden/indra/llcommon/llfasttimer.cpp
index 6c0f9ac..9dc5e17 100644
--- a/linden/indra/llcommon/llfasttimer.cpp
+++ b/linden/indra/llcommon/llfasttimer.cpp
@@ -2,6 +2,8 @@
2 * @file llfasttimer.cpp 2 * @file llfasttimer.cpp
3 * @brief Implementation of the fast timer. 3 * @brief Implementation of the fast timer.
4 * 4 *
5 * $LicenseInfo:firstyear=2004&license=viewergpl$
6 *
5 * Copyright (c) 2004-2007, Linden Research, Inc. 7 * Copyright (c) 2004-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,25 +26,23 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28#include "linden_common.h" 31#include "linden_common.h"
29 32
30#include "llfasttimer.h" 33#include "llfasttimer.h"
34
31#include "llprocessor.h" 35#include "llprocessor.h"
32 36
33#if LL_WINDOWS
34#include <time.h>
35 37
38#if LL_WINDOWS
36#elif LL_LINUX || LL_SOLARIS 39#elif LL_LINUX || LL_SOLARIS
37#include <time.h>
38#include <sys/time.h> 40#include <sys/time.h>
39#include <sched.h> 41#include <sched.h>
40
41#elif LL_DARWIN 42#elif LL_DARWIN
42# include <time.h> 43#include <sys/time.h>
43# include <sys/time.h>
44#else 44#else
45# error "architecture not supported" 45#error "architecture not supported"
46#endif 46#endif
47 47
48////////////////////////////////////////////////////////////////////////////// 48//////////////////////////////////////////////////////////////////////////////