diff options
author | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
commit | 215f423cbe18fe9ca14a26caef918d303bad28ff (patch) | |
tree | 0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/llcommon/lltimer.cpp | |
parent | Second Life viewer sources 1.18.3.5-RC (diff) | |
download | meta-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 '')
-rw-r--r-- | linden/indra/llcommon/lltimer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp index 177f1de..9786d44 100644 --- a/linden/indra/llcommon/lltimer.cpp +++ b/linden/indra/llcommon/lltimer.cpp | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file lltimer.cpp | 2 | * @file lltimer.cpp |
3 | * @brief Cross-platform objects for doing timing | 3 | * @brief Cross-platform objects for doing timing |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2000&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2000-2007, Linden Research, Inc. | 7 | * Copyright (c) 2000-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
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 | 31 | ||
29 | #include "linden_common.h" | 32 | #include "linden_common.h" |
@@ -36,13 +39,10 @@ | |||
36 | # define WIN32_LEAN_AND_MEAN | 39 | # define WIN32_LEAN_AND_MEAN |
37 | # include <winsock2.h> | 40 | # include <winsock2.h> |
38 | # include <windows.h> | 41 | # include <windows.h> |
39 | # include <time.h> | ||
40 | #elif LL_LINUX || LL_SOLARIS | 42 | #elif LL_LINUX || LL_SOLARIS |
41 | # include <time.h> | ||
42 | # include <sys/time.h> | 43 | # include <sys/time.h> |
43 | # include <sched.h> | 44 | # include <sched.h> |
44 | #elif LL_DARWIN | 45 | #elif LL_DARWIN |
45 | # include <time.h> | ||
46 | # include <sys/time.h> | 46 | # include <sys/time.h> |
47 | #else | 47 | #else |
48 | # error "architecture not supported" | 48 | # error "architecture not supported" |