diff options
| author | Max Kellermann <max@duempel.org> | 2013-06-24 16:17:46 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-06-24 16:17:46 +0200 |
| commit | ef48eca9cac875f65622daf500bd702e20d666f3 (patch) | |
| tree | 52fe455c347fd0f0ab14b471e2482c17c8aed5e6 /src/output/HttpdInternal.hxx | |
| parent | 906d2fbadf075b7d8e3a5be7134a9bebb09b7285 (diff) | |
| parent | e9e55b08127dc45b4c6045e1f42e34115086a521 (diff) | |
| download | mpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.gz mpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.xz mpd-ef48eca9cac875f65622daf500bd702e20d666f3.zip | |
Merge branch 'master' of git://git.musicpd.org/dk/mpd
Diffstat (limited to 'src/output/HttpdInternal.hxx')
| -rw-r--r-- | src/output/HttpdInternal.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/output/HttpdInternal.hxx b/src/output/HttpdInternal.hxx index e79b9a224..b79a22905 100644 --- a/src/output/HttpdInternal.hxx +++ b/src/output/HttpdInternal.hxx @@ -26,7 +26,7 @@ #define MPD_OUTPUT_HTTPD_INTERNAL_H #include "OutputInternal.hxx" -#include "timer.h" +#include "Timer.hxx" #include "thread/Mutex.hxx" #include "event/ServerSocket.hxx" @@ -72,10 +72,10 @@ struct HttpdOutput final : private ServerSocket { mutable Mutex mutex; /** - * A #timer object to synchronize this output with the + * A #Timer object to synchronize this output with the * wallclock. */ - struct timer *timer; + Timer *timer; /** * The header page, which is sent to every client on connect. |