diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-15 09:38:12 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-15 09:38:12 +0200 |
| commit | 0c13703da3641951bf061cac7c5cef034eda16f9 (patch) | |
| tree | 53af5b78031142e475a683d7bbc6c580b1d0e297 /src/system | |
| parent | b97b7a7493c0535cd21d05189c1a5b7cdd0accb2 (diff) | |
system/clock: convert to C++
Diffstat (limited to 'src/system')
| -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 |