Commit a4c321e4 authored by Erik de Castro Lopo's avatar Erik de Castro Lopo
Browse files

Large patch from Ben Allison fixing the MSVC build.

Patch tweaked a little to fix Linux build and clean up minor problems.
parent 91790ef9
......@@ -31,10 +31,8 @@
#include <stdio.h>
#include <stdlib.h>
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#include "FLAC++/decoder.h"
#include "share/compat.h"
static FLAC__uint64 total_samples = 0;
static unsigned sample_rate = 0;
......
......@@ -32,11 +32,9 @@
#include <stdlib.h>
#include <string.h>
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#include "FLAC++/metadata.h"
#include "FLAC++/encoder.h"
#include "share/compat.h"
#include <cstring>
......
......@@ -45,11 +45,12 @@
#include <stdint.h> /* for SIZE_MAX in case limits.h didn't get it */
#endif
#include <stdlib.h> /* for size_t, malloc(), etc */
#include "share/compat.h"
#ifndef SIZE_MAX
# ifndef SIZE_T_MAX
# ifdef _MSC_VER
# define SIZE_T_MAX UINT_MAX /* What happens on 64 bit windows? */
# define SIZE_T_MAX SIZE_MAX
# else
# error
# endif
......
......@@ -36,6 +36,9 @@
* It is assumed that this header will be included after "config.h".
*/
#ifndef FLAC__SHARE__COMPAT_H
#define FLAC__SHARE__COMPAT_H
#if defined _WIN32 && !defined __CYGWIN__
/* where MSVC puts unlink() */
# include <io.h>
......@@ -56,6 +59,7 @@
#endif
#if HAVE_INTTYPES_H
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#endif
......@@ -65,7 +69,10 @@
#endif
#if defined(_MSC_VER)
#if _MSC_VER < 1500
/* Visual Studio 2008 has restrict. */
#define restrict __restrict
#endif
#define inline __inline
#endif
......@@ -105,3 +112,31 @@
#include <utime.h> /* for utime() */
#include <unistd.h> /* for chown(), unlink() */
#endif
#if defined _MSC_VER
# if _MSC_VER >= 1600
/* Visual Studio 2010 has decent C99 support */
# include <stdint.h>
# define PRIu64 "llu"
# define PRId64 "lld"
# define PRIx64 "llx"
# else
# include <limits.h>
# ifndef UINT32_MAX
# define UINT32_MAX _UI32_MAX
# endif
typedef unsigned __int64 uint64_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int8 uint8_t;
typedef __int64 int64_t;
typedef __int32 int32_t;
typedef __int16 int16_t;
typedef __int8 int8_t;
# define PRIu64 "I64u"
# define PRId64 "I64d"
# define PRIx64 "I64x"
# endif
#endif /* defined _MSC_VER */
#endif /* FLAC__SHARE__COMPAT_H */
......@@ -25,10 +25,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include "FLAC/all.h"
#include "analyze.h"
#include "share/compat.h"
typedef struct {
FLAC__int32 residual;
unsigned count;
......
......@@ -36,6 +36,7 @@
/* for CHAR_BIT */
#include <limits.h>
#include "share/compat.h"
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
#include <intrin.h> /* for _BitScanReverse* */
......
......@@ -34,9 +34,10 @@
#endif
#include <math.h>
#include <inttypes.h>
#include "FLAC/assert.h"
#include "FLAC/format.h"
#include "share/compat.h"
#include "private/bitmath.h"
#include "private/lpc.h"
#include "private/macros.h"
......
......@@ -55,7 +55,11 @@
/* technically this should be in an "export.c" but this is convenient enough */
#ifdef FLAC_API_SUPPORTS_OGG_FLAC
FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = FLAC__HAS_OGG ;
#else
FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = 0 ;
#endif
/***********************************************************************
......
......@@ -24,8 +24,14 @@
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy()/memset() */
#include <sys/types.h> /* some flavors of BSD (like OS X) require this to get time_t */
#ifdef _MSC_VER
#include <sys/utime.h>
#else
#include <utime.h> /* for utime() */
#endif
#if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__
#include <unistd.h> /* for chown(), unlink() */
#endif
#include <sys/stat.h> /* for stat(), maybe chmod() */
#include "FLAC/assert.h"
#include "FLAC++/decoder.h"
......
......@@ -902,8 +902,11 @@ static FLAC__bool generate_noisy_sine(void)
sample += sin (2.0 * k * M_PI * 1.0 / 32.0);
sample *= 0.4;
#if !defined _MSC_VER
write_little_endian_int16(f, lrintf(sample * 32700.0));
#else
write_little_endian_int16(f, (FLAC__int16)(sample * 32700.0));
#endif
};
fclose(f);
......
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