[Pkg-mpd-commits] [pkg-mpd] 01/03: Imported Upstream version 0.18.13

Florian Schlichting fsfs at moszumanska.debian.org
Fri Sep 5 20:30:20 UTC 2014 

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 4e13c5e9f52f23fc6e5bd85fc5f1c77b0d0dd306
Author: Florian Schlichting <fsfs at debian.org>
Date:   Mon Sep 1 21:43:21 2014 +0200

    Imported Upstream version 0.18.13
---
 Makefile.am                           |  12 ++---
 Makefile.in                           |  89 ++++++++++++++++++----------------
 NEWS                                  |  12 +++++
 configure                             |  24 ++++-----
 configure.ac                          |   4 +-
 doc/doxygen.conf                      |   2 +-
 doc/protocol.xml                      |   7 ++-
 src/Playlist.hxx                      |   4 ++
 src/PlaylistControl.cxx               |  24 ++++++---
 src/decoder/DsdiffDecoderPlugin.cxx   |   2 +-
 src/decoder/DsfDecoderPlugin.cxx      |   2 +-
 src/decoder/FfmpegDecoderPlugin.cxx   |   9 ++++
 src/decoder/GmeDecoderPlugin.cxx      |   2 +-
 src/event/BufferedSocket.cxx          |   2 +-
 src/event/TimeoutMonitor.cxx          |   4 +-
 src/output/AlsaOutputPlugin.cxx       |  11 +++++
 src/output/OssOutputPlugin.cxx        |   4 ++
 src/system/ByteOrder.hxx              |  10 ++++
 src/util/ASCII.hxx                    |   2 +-
 src/{ => win32}/Win32Main.cxx         |   0
 src/{win => win32}/mpd.ico            | Bin
 src/{win => win32}/mpd_win32_rc.rc.in |   2 +-
 22 files changed, 148 insertions(+), 80 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 25352e3..6a5e9fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,7 +151,7 @@ src_mpd_SOURCES = \
 	src/IOThread.cxx src/IOThread.hxx \
 	src/Main.cxx src/Main.hxx \
 	src/Instance.cxx src/Instance.hxx \
-	src/Win32Main.cxx \
+	src/win32/Win32Main.cxx \
 	src/GlobalEvents.cxx src/GlobalEvents.hxx \
 	src/Daemon.cxx src/Daemon.hxx \
 	src/AudioCompress/compress.c \
@@ -211,14 +211,14 @@ src_mpd_SOURCES = \
 # Windows resource file
 #
 
-src/win/mpd_win32_rc.$(OBJEXT): src/win/mpd_win32_rc.rc
+src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc
 	$(WINDRES) -i $< -o $@
 
 if HAVE_WINDOWS
-noinst_DATA = src/win/mpd_win32_rc.rc
+noinst_DATA = src/win32/mpd_win32_rc.rc
 
-src_mpd_DEPENDENCIES = src/win/mpd_win32_rc.$(OBJEXT)
-src_mpd_LDFLAGS = -Wl,src/win/mpd_win32_rc.$(OBJEXT)
+EXTRA_src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
+src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT)
 endif
 
 if ENABLE_DESPOTIFY
@@ -1633,4 +1633,4 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
 	test/test_archive_zzip.sh \
 	$(wildcard scripts/*.sh) \
 	$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
-	src/win/mpd_win32_rc.rc.in src/win/mpd.ico
+	src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico
diff --git a/Makefile.in b/Makefile.in
index 4d22168..08cf916 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,22 +81,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = src/mpd$(EXEEXT)
- at HAVE_WINDOWS_FALSE@src_mpd_DEPENDENCIES = $(am__DEPENDENCIES_2) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_4) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_6) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_7) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_8) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_9) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_10) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_12) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_13) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_14) libconf.a \
- at HAVE_WINDOWS_FALSE@	libevent.a libthread.a libsystem.a \
- at HAVE_WINDOWS_FALSE@	libutil.a libfs.a $(am__DEPENDENCIES_1) \
- at HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1)
 @ENABLE_DESPOTIFY_TRUE at am__append_1 = \
 @ENABLE_DESPOTIFY_TRUE@	src/DespotifyUtils.cxx src/DespotifyUtils.hxx
 
@@ -402,7 +386,8 @@ bin_PROGRAMS = src/mpd$(EXEEXT)
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(top_srcdir)/src/win/mpd_win32_rc.rc.in \
+	$(srcdir)/config.h.in \
+	$(top_srcdir)/src/win32/mpd_win32_rc.rc.in \
 	$(top_srcdir)/doc/doxygen.conf.in $(srcdir)/mpd.service.in \
 	depcomp test-driver AUTHORS COPYING INSTALL NEWS README \
 	compile config.guess config.sub install-sh missing
@@ -423,7 +408,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = src/win/mpd_win32_rc.rc doc/doxygen.conf \
+CONFIG_CLEAN_FILES = src/win32/mpd_win32_rc.rc doc/doxygen.conf \
 	mpd.service
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -999,7 +984,7 @@ am__src_mpd_SOURCES_DIST = src/check.h src/gerror.h \
 	src/Listen.cxx src/Listen.hxx src/LogInit.cxx src/LogInit.hxx \
 	src/Log.cxx src/Log.hxx src/LogV.hxx src/ls.cxx src/ls.hxx \
 	src/IOThread.cxx src/IOThread.hxx src/Main.cxx src/Main.hxx \
-	src/Instance.cxx src/Instance.hxx src/Win32Main.cxx \
+	src/Instance.cxx src/Instance.hxx src/win32/Win32Main.cxx \
 	src/GlobalEvents.cxx src/GlobalEvents.hxx src/Daemon.cxx \
 	src/Daemon.hxx src/AudioCompress/compress.c \
 	src/MixRampInfo.hxx src/MusicBuffer.cxx src/MusicBuffer.hxx \
@@ -1150,7 +1135,7 @@ am_src_mpd_OBJECTS = $(am__objects_59) $(am__objects_60) \
 	src/src_mpd-LogInit.$(OBJEXT) src/src_mpd-Log.$(OBJEXT) \
 	src/src_mpd-ls.$(OBJEXT) src/src_mpd-IOThread.$(OBJEXT) \
 	src/src_mpd-Main.$(OBJEXT) src/src_mpd-Instance.$(OBJEXT) \
-	src/src_mpd-Win32Main.$(OBJEXT) \
+	src/win32/src_mpd-Win32Main.$(OBJEXT) \
 	src/src_mpd-GlobalEvents.$(OBJEXT) \
 	src/src_mpd-Daemon.$(OBJEXT) \
 	src/AudioCompress/src_mpd-compress.$(OBJEXT) \
@@ -1233,6 +1218,15 @@ am__DEPENDENCIES_12 = libfilter_plugins.a $(am__DEPENDENCIES_11)
 @ENABLE_ENCODER_TRUE@	$(am__DEPENDENCIES_1) \
 @ENABLE_ENCODER_TRUE@	$(am__DEPENDENCIES_1)
 am__DEPENDENCIES_14 = libmixer_plugins.a $(am__DEPENDENCIES_1)
+src_mpd_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \
+	$(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
+	$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
+	$(am__DEPENDENCIES_12) $(am__DEPENDENCIES_13) \
+	$(am__DEPENDENCIES_14) libconf.a libevent.a libthread.a \
+	libsystem.a libutil.a libfs.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 src_mpd_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(src_mpd_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am__src_pcm_dsd2pcm_dsd2pcm_SOURCES_DIST = src/pcm/dsd2pcm/dsd2pcm.c \
@@ -2324,7 +2318,7 @@ src_mpd_SOURCES = $(mpd_headers) $(DECODER_SRC) $(OUTPUT_API_SRC) \
 	src/Listen.cxx src/Listen.hxx src/LogInit.cxx src/LogInit.hxx \
 	src/Log.cxx src/Log.hxx src/LogV.hxx src/ls.cxx src/ls.hxx \
 	src/IOThread.cxx src/IOThread.hxx src/Main.cxx src/Main.hxx \
-	src/Instance.cxx src/Instance.hxx src/Win32Main.cxx \
+	src/Instance.cxx src/Instance.hxx src/win32/Win32Main.cxx \
 	src/GlobalEvents.cxx src/GlobalEvents.hxx src/Daemon.cxx \
 	src/Daemon.hxx src/AudioCompress/compress.c \
 	src/MixRampInfo.hxx src/MusicBuffer.cxx src/MusicBuffer.hxx \
@@ -2364,9 +2358,9 @@ src_mpd_SOURCES = $(mpd_headers) $(DECODER_SRC) $(OUTPUT_API_SRC) \
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_7) $(am__append_40) $(am__append_41) \
 	$(am__append_42)
- at HAVE_WINDOWS_TRUE@noinst_DATA = src/win/mpd_win32_rc.rc
- at HAVE_WINDOWS_TRUE@src_mpd_DEPENDENCIES = src/win/mpd_win32_rc.$(OBJEXT)
- at HAVE_WINDOWS_TRUE@src_mpd_LDFLAGS = -Wl,src/win/mpd_win32_rc.$(OBJEXT)
+ at HAVE_WINDOWS_TRUE@noinst_DATA = src/win32/mpd_win32_rc.rc
+ at HAVE_WINDOWS_TRUE@EXTRA_src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
+ at HAVE_WINDOWS_TRUE@src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT)
 
 # Generic utility library
 libutil_a_SOURCES = \
@@ -3236,7 +3230,7 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
 	test/test_archive_zzip.sh \
 	$(wildcard scripts/*.sh) \
 	$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
-	src/win/mpd_win32_rc.rc.in src/win/mpd.ico
+	src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -3292,7 +3286,7 @@ $(srcdir)/config.h.in:  $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-src/win/mpd_win32_rc.rc: $(top_builddir)/config.status $(top_srcdir)/src/win/mpd_win32_rc.rc.in
+src/win32/mpd_win32_rc.rc: $(top_builddir)/config.status $(top_srcdir)/src/win32/mpd_win32_rc.rc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 doc/doxygen.conf: $(top_builddir)/config.status $(top_srcdir)/doc/doxygen.conf.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -4222,8 +4216,14 @@ src/src_mpd-Main.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/src_mpd-Instance.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/src_mpd-Win32Main.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
+src/win32/$(am__dirstamp):
+	@$(MKDIR_P) src/win32
+	@: > src/win32/$(am__dirstamp)
+src/win32/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/win32/$(DEPDIR)
+	@: > src/win32/$(DEPDIR)/$(am__dirstamp)
+src/win32/src_mpd-Win32Main.$(OBJEXT): src/win32/$(am__dirstamp) \
+	src/win32/$(DEPDIR)/$(am__dirstamp)
 src/src_mpd-GlobalEvents.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/src_mpd-Daemon.$(OBJEXT): src/$(am__dirstamp) \
@@ -4688,6 +4688,7 @@ mostlyclean-compile:
 	-rm -f src/tag/*.$(OBJEXT)
 	-rm -f src/thread/*.$(OBJEXT)
 	-rm -f src/util/*.$(OBJEXT)
+	-rm -f src/win32/*.$(OBJEXT)
 	-rm -f test/*.$(OBJEXT)
 
 distclean-compile:
@@ -4883,7 +4884,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-UpdateSong.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-UpdateWalk.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-Volume.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-Win32Main.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-ZeroconfAvahi.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-ZeroconfBonjour.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/src_mpd-ZeroconfGlue.Po at am__quote@
@@ -5097,6 +5097,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at src/util/$(DEPDIR)/fifo_buffer.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/util/$(DEPDIR)/growing_fifo.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/util/$(DEPDIR)/list_sort.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/win32/$(DEPDIR)/src_mpd-Win32Main.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/DumpDatabase.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/FakeDecoderAPI.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at test/$(DEPDIR)/FakeReplayGainConfig.Po at am__quote@
@@ -8303,19 +8304,19 @@ src/src_mpd-Instance.obj: src/Instance.cxx
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/src_mpd-Instance.obj `if test -f 'src/Instance.cxx'; then $(CYGPATH_W) 'src/Instance.cxx'; else $(CYGPATH_W) '$(srcdir)/src/Instance.cxx'; fi`
 
-src/src_mpd-Win32Main.o: src/Win32Main.cxx
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/src_mpd-Win32Main.o -MD -MP -MF src/$(DEPDIR)/src_mpd-Win32Main.Tpo -c -o src/src_mpd-Win32Main.o `test -f 'src/Win32Main.cxx' || echo '$(srcdir)/'`src/Win32Main.cxx
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_mpd-Win32Main.Tpo src/$(DEPDIR)/src_mpd-Win32Main.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/Win32Main.cxx' object='src/src_mpd-Win32Main.o' libtool=no @AMDEPBACKSLASH@
+src/win32/src_mpd-Win32Main.o: src/win32/Win32Main.cxx
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/win32/src_mpd-Win32Main.o -MD -MP -MF src/win32/$(DEPDIR)/src_mpd-Win32Main.Tpo -c -o src/win32/src_mpd-Win32Main.o `test -f 'src/win32/Win32Main.cxx' || echo '$(srcdir)/'`src/win32/Win32Main.cxx
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/win32/$(DEPDIR)/src_mpd-Win32Main.Tpo src/win32/$(DEPDIR)/src_mpd-Win32Main.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/win32/Win32Main.cxx' object='src/win32/src_mpd-Win32Main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/src_mpd-Win32Main.o `test -f 'src/Win32Main.cxx' || echo '$(srcdir)/'`src/Win32Main.cxx
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/win32/src_mpd-Win32Main.o `test -f 'src/win32/Win32Main.cxx' || echo '$(srcdir)/'`src/win32/Win32Main.cxx
 
-src/src_mpd-Win32Main.obj: src/Win32Main.cxx
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/src_mpd-Win32Main.obj -MD -MP -MF src/$(DEPDIR)/src_mpd-Win32Main.Tpo -c -o src/src_mpd-Win32Main.obj `if test -f 'src/Win32Main.cxx'; then $(CYGPATH_W) 'src/Win32Main.cxx'; else $(CYGPATH_W) '$(srcdir)/src/Win32Main.cxx'; fi`
- at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_mpd-Win32Main.Tpo src/$(DEPDIR)/src_mpd-Win32Main.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/Win32Main.cxx' object='src/src_mpd-Win32Main.obj' libtool=no @AMDEPBACKSLASH@
+src/win32/src_mpd-Win32Main.obj: src/win32/Win32Main.cxx
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/win32/src_mpd-Win32Main.obj -MD -MP -MF src/win32/$(DEPDIR)/src_mpd-Win32Main.Tpo -c -o src/win32/src_mpd-Win32Main.obj `if test -f 'src/win32/Win32Main.cxx'; then $(CYGPATH_W) 'src/win32/Win32Main.cxx'; else $(CYGPATH_W) '$(srcdir)/src/win32/Win32Main.cxx'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/win32/$(DEPDIR)/src_mpd-Win32Main.Tpo src/win32/$(DEPDIR)/src_mpd-Win32Main.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/win32/Win32Main.cxx' object='src/win32/src_mpd-Win32Main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/src_mpd-Win32Main.obj `if test -f 'src/Win32Main.cxx'; then $(CYGPATH_W) 'src/Win32Main.cxx'; else $(CYGPATH_W) '$(srcdir)/src/Win32Main.cxx'; fi`
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/win32/src_mpd-Win32Main.obj `if test -f 'src/win32/Win32Main.cxx'; then $(CYGPATH_W) 'src/win32/Win32Main.cxx'; else $(CYGPATH_W) '$(srcdir)/src/win32/Win32Main.cxx'; fi`
 
 src/src_mpd-GlobalEvents.o: src/GlobalEvents.cxx
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_mpd_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/src_mpd-GlobalEvents.o -MD -MP -MF src/$(DEPDIR)/src_mpd-GlobalEvents.Tpo -c -o src/src_mpd-GlobalEvents.o `test -f 'src/GlobalEvents.cxx' || echo '$(srcdir)/'`src/GlobalEvents.cxx
@@ -10300,15 +10301,17 @@ distclean-generic:
 	-rm -f src/thread/$(am__dirstamp)
 	-rm -f src/util/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/util/$(am__dirstamp)
+	-rm -f src/win32/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/win32/$(am__dirstamp)
 	-rm -f test/$(DEPDIR)/$(am__dirstamp)
 	-rm -f test/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
- at ENABLE_DOCUMENTATION_FALSE@clean-local:
 @ENABLE_DOCUMENTATION_FALSE at uninstall-local:
 @ENABLE_DOCUMENTATION_FALSE at install-data-local:
+ at ENABLE_DOCUMENTATION_FALSE@clean-local:
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-local \
@@ -10316,7 +10319,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-local \
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf src/$(DEPDIR) src/AudioCompress/$(DEPDIR) src/archive/$(DEPDIR) src/command/$(DEPDIR) src/cue/$(DEPDIR) src/db/$(DEPDIR) src/decoder/$(DEPDIR) src/encoder/$(DEPDIR) src/event/$(DEPDIR) src/filter/$(DEPDIR) src/fs/$(DEPDIR) src/input/$(DEPDIR) src/mixer/$(DEPDIR) src/output/$(DEPDIR) src/pcm/$(DEPDIR) src/pcm/dsd2pcm/$(DEPDIR) src/playlist/$(DEPDIR) src/protocol/$(DEPDIR) src/system/$(DEPDIR) src/tag/$(DEPDIR) src/thread/$(DEPDIR) src/util/$(DEPDIR) test/$(DEPDIR)
+	-rm -rf src/$(DEPDIR) src/AudioCompress/$(DEPDIR) src/archive/$(DEPDIR) src/command/$(DEPDIR) src/cue/$(DEPDIR) src/db/$(DEPDIR) src/decoder/$(DEPDIR) src/encoder/$(DEPDIR) src/event/$(DEPDIR) src/filter/$(DEPDIR) src/fs/$(DEPDIR) src/input/$(DEPDIR) src/mixer/$(DEPDIR) src/output/$(DEPDIR) src/pcm/$(DEPDIR) src/pcm/dsd2pcm/$(DEPDIR) src/playlist/$(DEPDIR) src/protocol/$(DEPDIR) src/system/$(DEPDIR) src/tag/$(DEPDIR) src/thread/$(DEPDIR) src/util/$(DEPDIR) src/win32/$(DEPDIR) test/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -10366,7 +10369,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf src/$(DEPDIR) src/AudioCompress/$(DEPDIR) src/archive/$(DEPDIR) src/command/$(DEPDIR) src/cue/$(DEPDIR) src/db/$(DEPDIR) src/decoder/$(DEPDIR) src/encoder/$(DEPDIR) src/event/$(DEPDIR) src/filter/$(DEPDIR) src/fs/$(DEPDIR) src/input/$(DEPDIR) src/mixer/$(DEPDIR) src/output/$(DEPDIR) src/pcm/$(DEPDIR) src/pcm/dsd2pcm/$(DEPDIR) src/playlist/$(DEPDIR) src/protocol/$(DEPDIR) src/system/$(DEPDIR) src/tag/$(DEPDIR) src/thread/$(DEPDIR) src/util/$(DEPDIR) test/$(DEPDIR)
+	-rm -rf src/$(DEPDIR) src/AudioCompress/$(DEPDIR) src/archive/$(DEPDIR) src/command/$(DEPDIR) src/cue/$(DEPDIR) src/db/$(DEPDIR) src/decoder/$(DEPDIR) src/encoder/$(DEPDIR) src/event/$(DEPDIR) src/filter/$(DEPDIR) src/fs/$(DEPDIR) src/input/$(DEPDIR) src/mixer/$(DEPDIR) src/output/$(DEPDIR) src/pcm/$(DEPDIR) src/pcm/dsd2pcm/$(DEPDIR) src/playlist/$(DEPDIR) src/protocol/$(DEPDIR) src/system/$(DEPDIR) src/tag/$(DEPDIR) src/thread/$(DEPDIR) src/util/$(DEPDIR) src/win32/$(DEPDIR) test/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -10420,7 +10423,7 @@ uninstall-man: uninstall-man1 uninstall-man5
 # Windows resource file
 #
 
-src/win/mpd_win32_rc.$(OBJEXT): src/win/mpd_win32_rc.rc
+src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc
 	$(WINDRES) -i $< -o $@
 sparse-check:
 	$(SPARSE) -I. $(src_mpd_CFLAGS) $(src_mpd_CPPFLAGS) $(SPARSE_FLAGS) $(SPARSE_CPPFLAGS) $(SPARSE_SRC)
diff --git a/NEWS b/NEWS
index 8cc6cdd..59c5687 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+ver 0.18.13 (2014/08/31)
+* protocol
+  - don't change song on "seekcur" in random mode
+* decoder
+  - dsdiff, dsf: fix endless loop on malformed file
+  - ffmpeg: support ffmpeg/libav version 11
+  - gme: fix song duration
+* output
+  - alsa: fix endless loop at end of file in dsd_usb mode
+* fix state file saver
+* fix build failure on Darwin
+
 ver 0.18.12 (2014/07/30)
 * database
   - proxy: fix build failure with libmpdclient 2.2
diff --git a/configure b/configure
index 44cc171..3297f92 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mpd 0.18.12.
+# Generated by GNU Autoconf 2.69 for mpd 0.18.13.
 #
 # Report bugs to <mpd-devel at musicpd.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mpd'
 PACKAGE_TARNAME='mpd'
-PACKAGE_VERSION='0.18.12'
-PACKAGE_STRING='mpd 0.18.12'
+PACKAGE_VERSION='0.18.13'
+PACKAGE_STRING='mpd 0.18.13'
 PACKAGE_BUGREPORT='mpd-devel at musicpd.org'
 PACKAGE_URL=''
 
@@ -1673,7 +1673,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mpd 0.18.12 to adapt to many kinds of systems.
+\`configure' configures mpd 0.18.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1743,7 +1743,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mpd 0.18.12:";;
+     short | recursive ) echo "Configuration of mpd 0.18.13:";;
    esac
   cat <<\_ACEOF
 
@@ -2041,7 +2041,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mpd configure 0.18.12
+mpd configure 0.18.13
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2494,7 +2494,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mpd $as_me 0.18.12, which was
+It was created by mpd $as_me 0.18.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3364,7 +3364,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mpd'
- VERSION='0.18.12'
+ VERSION='0.18.13'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5563,7 +5563,7 @@ host_is_darwin=no
 
 case "$host_os" in
 mingw32* | windows*)
-	ac_config_files="$ac_config_files src/win/mpd_win32_rc.rc"
+	ac_config_files="$ac_config_files src/win32/mpd_win32_rc.rc"
 
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
@@ -18461,7 +18461,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mpd $as_me 0.18.12, which was
+This file was extended by mpd $as_me 0.18.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18527,7 +18527,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mpd config.status 0.18.12
+mpd config.status 0.18.13
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -18658,7 +18658,7 @@ do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "src/win/mpd_win32_rc.rc") CONFIG_FILES="$CONFIG_FILES src/win/mpd_win32_rc.rc" ;;
+    "src/win32/mpd_win32_rc.rc") CONFIG_FILES="$CONFIG_FILES src/win32/mpd_win32_rc.rc" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/doxygen.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen.conf" ;;
     "mpd.service") CONFIG_FILES="$CONFIG_FILES mpd.service" ;;
diff --git a/configure.ac b/configure.ac
index 36f785f..526b4c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 
-AC_INIT(mpd, 0.18.12, mpd-devel at musicpd.org)
+AC_INIT(mpd, 0.18.13, mpd-devel at musicpd.org)
 
 VERSION_MAJOR=0
 VERSION_MINOR=18
@@ -70,7 +70,7 @@ host_is_darwin=no
 case "$host_os" in
 mingw32* | windows*)
 	AC_CONFIG_FILES([
-		src/win/mpd_win32_rc.rc
+		src/win32/mpd_win32_rc.rc
 	])
 	AC_CHECK_TOOL(WINDRES, windres)
 	AM_CPPFLAGS="$AM_CPPFLAGS -DWIN32_LEAN_AND_MEAN"
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 81bd1ec..c3a6da5 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -31,7 +31,7 @@ PROJECT_NAME           = MPD
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 0.18.12
+PROJECT_NUMBER = 0.18.13
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/doc/protocol.xml b/doc/protocol.xml
index abc74e4..5aa9c91 100644
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
@@ -576,7 +576,12 @@
               </listitem>
               <listitem>
                 <para>
-                  <varname>songs</varname>: number of albums
+                  <varname>albums</varname>: number of albums
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <varname>songs</varname>: number of songs
                 </para>
               </listitem>
               <listitem>
diff --git a/src/Playlist.hxx b/src/Playlist.hxx
index b660ecb..582b364 100644
--- a/src/Playlist.hxx
+++ b/src/Playlist.hxx
@@ -234,6 +234,10 @@ public:
 
 	void PlayPrevious(PlayerControl &pc);
 
+	PlaylistResult SeekSongOrder(PlayerControl &pc,
+				     unsigned song_order,
+				     float seek_time);
+
 	PlaylistResult SeekSongPosition(PlayerControl &pc,
 					unsigned song_position,
 					float seek_time);
diff --git a/src/PlaylistControl.cxx b/src/PlaylistControl.cxx
index 58971a4..b0ff03a 100644
--- a/src/PlaylistControl.cxx
+++ b/src/PlaylistControl.cxx
@@ -190,17 +190,12 @@ playlist::PlayPrevious(PlayerControl &pc)
 }
 
 PlaylistResult
-playlist::SeekSongPosition(PlayerControl &pc, unsigned song, float seek_time)
+playlist::SeekSongOrder(PlayerControl &pc, unsigned i, float seek_time)
 {
-	if (!queue.IsValidPosition(song))
-		return PlaylistResult::BAD_RANGE;
+	assert(queue.IsValidOrder(i));
 
 	const Song *queued_song = GetQueuedSong();
 
-	unsigned i = queue.random
-		? queue.PositionToOrder(song)
-		: song;
-
 	pc.ClearError();
 	stop_on_error = true;
 	error_count = 0;
@@ -229,6 +224,19 @@ playlist::SeekSongPosition(PlayerControl &pc, unsigned song, float seek_time)
 }
 
 PlaylistResult
+playlist::SeekSongPosition(PlayerControl &pc, unsigned song, float seek_time)
+{
+	if (!queue.IsValidPosition(song))
+		return PlaylistResult::BAD_RANGE;
+
+	unsigned i = queue.random
+		? queue.PositionToOrder(song)
+		: song;
+
+	return SeekSongOrder(pc, i, seek_time);
+}
+
+PlaylistResult
 playlist::SeekSongId(PlayerControl &pc, unsigned id, float seek_time)
 {
 	int song = queue.IdToPosition(id);
@@ -257,5 +265,5 @@ playlist::SeekCurrent(PlayerControl &pc, float seek_time, bool relative)
 	if (seek_time < 0)
 		seek_time = 0;
 
-	return SeekSongPosition(pc, current, seek_time);
+	return SeekSongOrder(pc, current, seek_time);
 }
diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx
index 60b2e76..7673952 100644
--- a/src/decoder/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/DsdiffDecoderPlugin.cxx
@@ -377,7 +377,7 @@ dsdiff_decode_chunk(Decoder &decoder, InputStream &is,
 	const unsigned buffer_samples = buffer_frames * frame_size;
 	const size_t buffer_size = buffer_samples * sample_size;
 
-	while (chunk_size > 0) {
+	while (chunk_size >= frame_size) {
 		/* see how much aligned data from the remaining chunk
 		   fits into the local buffer */
 		size_t now_size = buffer_size;
diff --git a/src/decoder/DsfDecoderPlugin.cxx b/src/decoder/DsfDecoderPlugin.cxx
index ad5483c..9fbfe9c 100644
--- a/src/decoder/DsfDecoderPlugin.cxx
+++ b/src/decoder/DsfDecoderPlugin.cxx
@@ -238,7 +238,7 @@ dsf_decode_chunk(Decoder &decoder, InputStream &is,
 	const unsigned buffer_samples = buffer_frames * frame_size;
 	const size_t buffer_size = buffer_samples * sample_size;
 
-	while (chunk_size > 0) {
+	while (chunk_size >= frame_size) {
 		/* see how much aligned data from the remaining chunk
 		   fits into the local buffer */
 		size_t now_size = buffer_size;
diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx
index bcb1ae3..5133f91 100644
--- a/src/decoder/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx
@@ -433,9 +433,18 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
 	AVStream *av_stream = format_context->streams[audio_stream];
 
 	AVCodecContext *codec_context = av_stream->codec;
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0)
+	const AVCodecDescriptor *codec_descriptor =
+		avcodec_descriptor_get(codec_context->codec_id);
+	if (codec_descriptor != nullptr)
+		FormatDebug(ffmpeg_domain, "codec '%s'",
+			    codec_descriptor->name);
+#else
 	if (codec_context->codec_name[0] != 0)
 		FormatDebug(ffmpeg_domain, "codec '%s'",
 			    codec_context->codec_name);
+#endif
 
 	AVCodec *codec = avcodec_find_decoder(codec_context->codec_id);
 
diff --git a/src/decoder/GmeDecoderPlugin.cxx b/src/decoder/GmeDecoderPlugin.cxx
index d67ee4b..9c9b194 100644
--- a/src/decoder/GmeDecoderPlugin.cxx
+++ b/src/decoder/GmeDecoderPlugin.cxx
@@ -235,7 +235,7 @@ gme_scan_file(const char *path_fs,
 
 	if (ti->length > 0)
 		tag_handler_invoke_duration(handler, handler_ctx,
-					    ti->length / 100);
+					    ti->length / 1000);
 
 	if (ti->song != nullptr) {
 		if (gme_track_count(emu) > 1) {
diff --git a/src/event/BufferedSocket.cxx b/src/event/BufferedSocket.cxx
index 92e350e..c93ea34 100644
--- a/src/event/BufferedSocket.cxx
+++ b/src/event/BufferedSocket.cxx
@@ -118,7 +118,7 @@ BufferedSocket::OnSocketReady(unsigned flags)
 		if (!ReadToBuffer() || !ResumeInput())
 			return false;
 
-		if (input.IsFull())
+		if (!input.IsFull())
 			ScheduleRead();
 	}
 
diff --git a/src/event/TimeoutMonitor.cxx b/src/event/TimeoutMonitor.cxx
index cffad6b..003b5b7 100644
--- a/src/event/TimeoutMonitor.cxx
+++ b/src/event/TimeoutMonitor.cxx
@@ -64,7 +64,9 @@ TimeoutMonitor::ScheduleSeconds(unsigned s)
 void
 TimeoutMonitor::Run()
 {
-#ifndef USE_EPOLL
+#ifdef USE_EPOLL
+	active = false;
+#else
 	Cancel();
 #endif
 
diff --git a/src/output/AlsaOutputPlugin.cxx b/src/output/AlsaOutputPlugin.cxx
index 6668c92..f8aae13 100644
--- a/src/output/AlsaOutputPlugin.cxx
+++ b/src/output/AlsaOutputPlugin.cxx
@@ -802,6 +802,7 @@ alsa_play(struct audio_output *ao, const void *chunk, size_t size,
 {
 	AlsaOutput *ad = (AlsaOutput *)ao;
 
+	assert(size > 0);
 	assert(size % ad->in_frame_size == 0);
 
 	if (ad->must_prepare) {
@@ -814,11 +815,21 @@ alsa_play(struct audio_output *ao, const void *chunk, size_t size,
 		}
 	}
 
+	const size_t original_size = size;
 	chunk = ad->pcm_export->Export(chunk, size, size);
+	if (size == 0)
+		/* the DoP (DSD over PCM) filter converts two frames
+		   at a time and ignores the last odd frame; if there
+		   was only one frame (e.g. the last frame in the
+		   file), the result is empty; to avoid an endless
+		   loop, bail out here, and pretend the one frame has
+		   been played */
+		return original_size;
 
 	assert(size % ad->out_frame_size == 0);
 
 	size /= ad->out_frame_size;
+	assert(size > 0);
 
 	while (true) {
 		snd_pcm_sframes_t ret = ad->writei(ad->pcm, chunk, size);
diff --git a/src/output/OssOutputPlugin.cxx b/src/output/OssOutputPlugin.cxx
index 68f2a38..cdde6d5 100644
--- a/src/output/OssOutputPlugin.cxx
+++ b/src/output/OssOutputPlugin.cxx
@@ -727,6 +727,8 @@ oss_output_play(struct audio_output *ao, const void *chunk, size_t size,
 	OssOutput *od = (OssOutput *)ao;
 	ssize_t ret;
 
+	assert(size > 0);
+
 	/* reopen the device since it was closed by dropBufferedAudio */
 	if (od->fd < 0 && !oss_reopen(od, error))
 		return 0;
@@ -735,6 +737,8 @@ oss_output_play(struct audio_output *ao, const void *chunk, size_t size,
 	chunk = od->pcm_export->Export(chunk, size, size);
 #endif
 
+	assert(size > 0);
+
 	while (true) {
 		ret = write(od->fd, chunk, size);
 		if (ret > 0) {
diff --git a/src/system/ByteOrder.hxx b/src/system/ByteOrder.hxx
index 8beda61..42181fe 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>
diff --git a/src/util/ASCII.hxx b/src/util/ASCII.hxx
index adea6dc..19a18a1 100644
--- a/src/util/ASCII.hxx
+++ b/src/util/ASCII.hxx
@@ -33,7 +33,7 @@
 #include "Compiler.h"
 
 #include <assert.h>
-#include <string.h>
+#include <strings.h>
 
 /**
  * Determine whether two strings are equal, ignoring case for ASCII
diff --git a/src/Win32Main.cxx b/src/win32/Win32Main.cxx
similarity index 100%
rename from src/Win32Main.cxx
rename to src/win32/Win32Main.cxx
diff --git a/src/win/mpd.ico b/src/win32/mpd.ico
similarity index 100%
rename from src/win/mpd.ico
rename to src/win32/mpd.ico
diff --git a/src/win/mpd_win32_rc.rc.in b/src/win32/mpd_win32_rc.rc.in
similarity index 94%
rename from src/win/mpd_win32_rc.rc.in
rename to src/win32/mpd_win32_rc.rc.in
index a31118a..e5312dc 100644
--- a/src/win/mpd_win32_rc.rc.in
+++ b/src/win32/mpd_win32_rc.rc.in
@@ -3,7 +3,7 @@
 #define VERSION_NUMBER @VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA@
 #define VERSION_NUMBER_STR "@VERSION_MAJOR@, at VERSION_MINOR@, at VERSION_REVISION@, at VERSION_EXTRA@"
 
-MPD_ICON ICON "@top_srcdir@/src/win/mpd.ico"
+MPD_ICON ICON "@top_srcdir@/src/win32/mpd.ico"
 
 1 VERSIONINFO
 FILETYPE VFT_APP

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git

More information about the Pkg-mpd-commits mailing list