aboutsummaryrefslogtreecommitdiffstats
path: root/src/system
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/system/Clock.cxx (renamed from src/system/clock.c)8
-rw-r--r--src/system/Clock.hxx (renamed from src/system/clock.h)14
2 files changed, 7 insertions, 15 deletions
diff --git a/src/system/clock.c b/src/system/Clock.cxx
index d987aed48..347997a44 100644
--- a/src/system/clock.c
+++ b/src/system/Clock.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "clock.h"
+#include "Clock.hxx"
#ifdef WIN32
#include <windows.h>
@@ -31,7 +31,7 @@
#endif
unsigned
-monotonic_clock_ms(void)
+MonotonicClockMS(void)
{
#ifdef WIN32
return GetTickCount();
@@ -55,7 +55,7 @@ monotonic_clock_ms(void)
}
uint64_t
-monotonic_clock_us(void)
+MonotonicClockUS(void)
{
#ifdef WIN32
LARGE_INTEGER l_value, l_frequency;
diff --git a/src/system/clock.h b/src/system/Clock.hxx
index ae774ff85..7be1127bf 100644
--- a/src/system/clock.h
+++ b/src/system/Clock.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -24,26 +24,18 @@
#include <stdint.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**
* Returns the value of a monotonic clock in milliseconds.
*/
gcc_pure
unsigned
-monotonic_clock_ms(void);
+MonotonicClockMS();
/**
* Returns the value of a monotonic clock in microseconds.
*/
gcc_pure
uint64_t
-monotonic_clock_us(void);
-
-#ifdef __cplusplus
-}
-#endif
+MonotonicClockUS();
#endif