diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-24 13:15:17 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-24 13:15:17 +0200 |
| commit | 77f2cd6513e417ae2f92fdfb572b89b7d8160996 (patch) | |
| tree | 2237f39d8e4f04384f16b05f71fe0840abe8c6b6 | |
| parent | baad86bcd795bc9a52e27c73bfec6cbda392415f (diff) | |
| parent | d16fb797088e32cccecd6373fbe5eaefff423de2 (diff) | |
| download | mpd-77f2cd6513e417ae2f92fdfb572b89b7d8160996.tar.gz mpd-77f2cd6513e417ae2f92fdfb572b89b7d8160996.tar.xz mpd-77f2cd6513e417ae2f92fdfb572b89b7d8160996.zip | |
Merge branch 'v0.18.x'
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/event/TimeoutMonitor.cxx | 1 | ||||
| -rw-r--r-- | src/system/ByteOrder.hxx | 10 |
3 files changed, 13 insertions, 0 deletions
@@ -69,6 +69,8 @@ ver 0.18.13 (not yet released) * decoder - dsdiff, dsf: fix endless loop on malformed file - ffmpeg: support ffmpeg/libav version 11 +* fix state file saver +* fix build failure on Darwin ver 0.18.12 (2014/07/30) * database diff --git a/src/event/TimeoutMonitor.cxx b/src/event/TimeoutMonitor.cxx index e04af3e4e..0f9b77ce2 100644 --- a/src/event/TimeoutMonitor.cxx +++ b/src/event/TimeoutMonitor.cxx @@ -51,5 +51,6 @@ TimeoutMonitor::ScheduleSeconds(unsigned s) void TimeoutMonitor::Run() { + active = true; OnTimeout(); } diff --git a/src/system/ByteOrder.hxx b/src/system/ByteOrder.hxx index 8beda61c7..42181fe2c 100644 --- a/src/system/ByteOrder.hxx +++ b/src/system/ByteOrder.hxx @@ -40,6 +40,16 @@ /* well-known big-endian */ # define IS_LITTLE_ENDIAN false # define IS_BIG_ENDIAN true +#elif defined(__APPLE__) +/* compile-time check for MacOS */ +# include <machine/endian.h> +# if BYTE_ORDER == LITTLE_ENDIAN +# define IS_LITTLE_ENDIAN true +# define IS_BIG_ENDIAN false +# else +# define IS_LITTLE_ENDIAN false +# define IS_BIG_ENDIAN true +# endif #else /* generic compile-time check */ # include <endian.h> |