claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for windows builds (SF#1676822: https://sourceforge.net/tracker2/?func=detail&aid=1676822&group_id=13478&atid=113478)

Browse Source
This commit is contained in:
Josh Coalson
2009-01-02 01:12:59 +00:00
parent f3a8e5caf6
commit a832ef32fb
8 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libFLAC/bitreader.c
View File

@@ -36,13 +36,16 @@
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy(), memset() */
#ifdef _MSC_VER
#include <winsock.h> /* for ntohl() */
# include <winsock.h> /* for ntohl() */
# if _MSC_VER >= 1310
# include <winsock2.h> /* for ntohl(), sometimes it is not in winsock.h */
# endif
#elif defined FLAC__SYS_DARWIN
#include <machine/endian.h> /* for ntohl() */
# include <machine/endian.h> /* for ntohl() */
#elif defined __MINGW32__
#include <winsock.h> /* for ntohl() */
# include <winsock.h> /* for ntohl() */
#else
#include <netinet/in.h> /* for ntohl() */
# include <netinet/in.h> /* for ntohl() */
#endif
#include "private/bitmath.h"
#include "private/bitreader.h"

11
src/libFLAC/bitwriter.c
View File

@@ -36,13 +36,16 @@
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy(), memset() */
#ifdef _MSC_VER
#include <winsock.h> /* for ntohl() */
# include <winsock.h> /* for ntohl() */
# if _MSC_VER >= 1310
# include <winsock2.h> /* for ntohl(), sometimes it is not in winsock.h */
# endif
#elif defined FLAC__SYS_DARWIN
#include <machine/endian.h> /* for ntohl() */
# include <machine/endian.h> /* for ntohl() */
#elif defined __MINGW32__
#include <winsock.h> /* for ntohl() */
# include <winsock.h> /* for ntohl() */
#else
#include <netinet/in.h> /* for ntohl() */
# include <netinet/in.h> /* for ntohl() */
#endif
#if 0 /* UNUSED */
#include "private/bitmath.h"

2
src/libFLAC/cpu.c
View File

@@ -136,7 +136,7 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_EXTMMX = 0x00400000;
# endif
# elif defined(_MSC_VER)
# include <windows.h>
# undef USE_TRY_CATCH_FLAVOR /* #define this to use the try/catch method for catching illegal opcode exception */
# define USE_TRY_CATCH_FLAVOR /* sigill_handler flavor resulted in several crash reports on win32 */
# ifdef USE_TRY_CATCH_FLAVOR
# else
LONG CALLBACK sigill_handler_sse_os(EXCEPTION_POINTERS *ep)

2
src/libFLAC/stream_encoder.c
View File

@@ -2155,6 +2155,8 @@ void set_defaults_(FLAC__StreamEncoder *encoder)
#if FLAC__HAS_OGG
FLAC__ogg_encoder_aspect_set_defaults(&encoder->protected_->ogg_encoder_aspect);
#endif
FLAC__stream_encoder_set_compression_level(encoder, 5);
}
void free_(FLAC__StreamEncoder *encoder)