Skip to content

M
mpd
Commit 77f2cd65 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Merge branch 'v0.18.x'

parents baad86bc d16fb797
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
NEWS
View file @ 77f2cd65
...@@ -69,6 +69,8 @@ ver 0.18.13 (not yet released) ...@@ -69,6 +69,8 @@ ver 0.18.13 (not yet released)
* decoder * decoder
- dsdiff, dsf: fix endless loop on malformed file - dsdiff, dsf: fix endless loop on malformed file
- ffmpeg: support ffmpeg/libav version 11 - ffmpeg: support ffmpeg/libav version 11
* fix state file saver
* fix build failure on Darwin
ver 0.18.12 (2014/07/30) ver 0.18.12 (2014/07/30)
* database * database
......
src/event/TimeoutMonitor.cxx
View file @ 77f2cd65
...@@ -51,5 +51,6 @@ TimeoutMonitor::ScheduleSeconds(unsigned s) ...@@ -51,5 +51,6 @@ TimeoutMonitor::ScheduleSeconds(unsigned s)
void void
TimeoutMonitor::Run() TimeoutMonitor::Run()
{ {
active = true;
OnTimeout(); OnTimeout();
} }
src/system/ByteOrder.hxx
View file @ 77f2cd65
...@@ -40,6 +40,16 @@ ...@@ -40,6 +40,16 @@
/* well-known big-endian */ /* well-known big-endian */
# define IS_LITTLE_ENDIAN false # define IS_LITTLE_ENDIAN false
# define IS_BIG_ENDIAN true # 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 #else
/* generic compile-time check */ /* generic compile-time check */
# include <endian.h> # include <endian.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment