[SoX-commits] [git] 0ed6d04ef7 Link Windows build to wsock32.dll again

[Ulrich K. <uk...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sox".

The branch, master has been updated
       via  0ed6d04ef74863e1bebd3be7cf4932c0b066c9a7 (commit)
      from  5c58413544fd600bf12fdc54fa9648f0bc1ea860 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0ed6d04ef74863e1bebd3be7cf4932c0b066c9a7
Author: Ulrich Klauer <ul...@ch...>
Date:   Sun Feb 10 15:56:13 2013 +0100

    Link Windows build to wsock32.dll again
    
    Link the Windows build to wsock32.dll for ntohl() again instead of
    trying to provide an own implementation.
    
    (Partial revert of commit d0647a4f8650f92057274f2412bb8aa79f71a242.)
    
    This will be rendered unnecessary by the forthcoming 1.3.0 release of
    libflac that removes the call to ntohl().

diff --git a/configure.ac b/configure.ac
index 76fc02a..0922d63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,6 +441,11 @@ fi
 #  support for OGG and if OGG libraries are found on this
 #  system then its highly likely to be compiled into FLAC
 #  and will require these at link time.
+case $target in
+  *mingw*)
+  FLAC_LIBS="-lwsock32"
+  ;;
+esac
 AC_OPTIONAL_FORMAT(flac, FLAC, [AC_CHECK_HEADER(FLAC/all.h, [AC_CHECK_DECL(FLAC_API_VERSION_CURRENT, [AC_CHECK_LIB(FLAC, FLAC__stream_encoder_new, FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_VORBIS_LIBS",using_flac=no, $FLAC_LIBS $OGG_VORBIS_LIBS)], using_flac=no, [#include <FLAC/all.h>])], using_flac=no)], using_flac=no)
 
 
diff --git a/src/flac.c b/src/flac.c
index 680b146..0d7829e 100644
--- a/src/flac.c
+++ b/src/flac.c
@@ -55,14 +55,6 @@ typedef struct {
 } priv_t;
 
 
-#if defined(__MINGW32__)
-/* Provide a local definition of ntohl so we don't need to load wsock32.dll. */
-unsigned long __stdcall ntohl(unsigned long val)
-{
-    return lsx_swapdw(val);
-}
-#endif
-
 static FLAC__StreamDecoderReadStatus decoder_read_callback(FLAC__StreamDecoder const* decoder UNUSED, FLAC__byte buffer[], size_t* bytes, void* ft_data)
 {
   sox_format_t* ft = (sox_format_t*)ft_data;

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    5 +++++
 src/flac.c   |    8 --------
 2 files changed, 5 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
sox