aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/lltimer.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcommon/lltimer.h')
-rw-r--r--linden/indra/llcommon/lltimer.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h
index 35f0a7b..4ffb9c8 100644
--- a/linden/indra/llcommon/lltimer.h
+++ b/linden/indra/llcommon/lltimer.h
@@ -2,6 +2,8 @@
2 * @file lltimer.h 2 * @file lltimer.h
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,18 +26,16 @@
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#ifndef LL_TIMER_H 32#ifndef LL_TIMER_H
30#define LL_TIMER_H 33#define LL_TIMER_H
31 34
32#if LL_LINUX || LL_DARWIN 35#if LL_LINUX || LL_DARWIN
33# include <time.h> 36#include <sys/time.h>
34# include <sys/time.h>
35#endif 37#endif
36 38
37#include <list>
38
39// units conversions 39// units conversions
40#ifndef USEC_PER_SEC 40#ifndef USEC_PER_SEC
41 const U32 USEC_PER_SEC = 1000000; 41 const U32 USEC_PER_SEC = 1000000;