Move all definitions of FLAC__U64L to one place.

diff --git a/include/share/compat.h b/include/share/compat.h
index 8ad3698..220f5a2 100644 (file)
--- a/include/share/compat.h
+++ b/include/share/compat.h
@@ -68,3 +68,9 @@
 #define restrict __restrict
 #endif
 
+/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
+#ifdef _MSC_VER
+#define FLAC__U64L(x) x
+#else
+#define FLAC__U64L(x) x##LLU
+#endif

diff --git a/src/libFLAC/bitreader.c b/src/libFLAC/bitreader.c
index 9e15db0..2660c42 100644 (file)
--- a/src/libFLAC/bitreader.c
+++ b/src/libFLAC/bitreader.c
@@ -40,6 +40,7 @@
 #include "private/crc.h"
 #include "private/macros.h"
 #include "FLAC/assert.h"
+#include "share/compat.h"
 #include "share/endswap.h"
 
 /* Things should be fastest when this matches the machine word size */
@@ -72,13 +73,6 @@
  */
 static const unsigned FLAC__BITREADER_DEFAULT_CAPACITY = 65536u / FLAC__BITS_PER_WORD; /* in words */
 
-/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
-#ifdef _MSC_VER
-#define FLAC__U64L(x) x
-#else
-#define FLAC__U64L(x) x##LLU
-#endif
-
 /* WATCHOUT: assembly routines rely on the order in which these fields are declared */
 struct FLAC__BitReader {
        /* any partially-consumed word at the head will stay right-justified as bits are consumed from the left */

diff --git a/src/libFLAC/bitwriter.c b/src/libFLAC/bitwriter.c
index 1f005a3..7d61d73 100644 (file)
--- a/src/libFLAC/bitwriter.c
+++ b/src/libFLAC/bitwriter.c
@@ -40,6 +40,7 @@
 #include "private/macros.h"
 #include "FLAC/assert.h"
 #include "share/alloc.h"
+#include "share/compat.h"
 #include "share/endswap.h"
 
 /* Things should be fastest when this matches the machine word size */
@@ -68,13 +69,6 @@ static const unsigned FLAC__BITWRITER_DEFAULT_INCREMENT = 4096u / sizeof(uint32_
 #define FLAC__WORDS_TO_BITS(words) ((words) * FLAC__BITS_PER_WORD)
 #define FLAC__TOTAL_BITS(bw) (FLAC__WORDS_TO_BITS((bw)->words) + (bw)->bits)
 
-/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
-#ifdef _MSC_VER
-#define FLAC__U64L(x) x
-#else
-#define FLAC__U64L(x) x##LLU
-#endif
-
 struct FLAC__BitWriter {
        uint32_t *buffer;
        uint32_t accum; /* accumulator; bits are right-justified; when full, accum is appended to buffer */

diff --git a/src/libFLAC/float.c b/src/libFLAC/float.c
index 1713126..d411e4e 100644 (file)
--- a/src/libFLAC/float.c
+++ b/src/libFLAC/float.c
@@ -34,18 +34,11 @@
 #endif
 
 #include "FLAC/assert.h"
-
+#include "share/compat.h"
 #include "private/float.h"
 
 #ifdef FLAC__INTEGER_ONLY_LIBRARY
 
-/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
-#ifdef _MSC_VER
-#define FLAC__U64L(x) x
-#else
-#define FLAC__U64L(x) x##LLU
-#endif
-
 const FLAC__fixedpoint FLAC__FP_ZERO = 0;
 const FLAC__fixedpoint FLAC__FP_ONE_HALF = 0x00008000;
 const FLAC__fixedpoint FLAC__FP_ONE = 0x00010000;
@@ -282,7 +275,7 @@ FLAC__uint32 FLAC__fixedpoint_log2(FLAC__uint32 x, unsigned fracbits, unsigned p
 
        if(x < ONE)
                return 0;
-       
+
        if(precision > LOG2_LOOKUP_PRECISION)
                precision = LOG2_LOOKUP_PRECISION;
 

diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c
index d796547..ad5fcd0 100644 (file)
--- a/src/libFLAC/format.c
+++ b/src/libFLAC/format.c
@@ -38,16 +38,10 @@
 #include <string.h> /* for memset() */
 #include "FLAC/assert.h"
 #include "FLAC/format.h"
+#include "share/compat.h"
 #include "private/format.h"
 #include "private/macros.h"
 
-/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
-#ifdef _MSC_VER
-#define FLAC__U64L(x) x
-#else
-#define FLAC__U64L(x) x##LLU
-#endif
-
 /* VERSION should come from configure */
 FLAC_API const char *FLAC__VERSION_STRING = VERSION;
 

diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index 9aa7658..ec728ab 100644 (file)
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -61,13 +61,6 @@
 #include "private/memory.h"
 #include "private/macros.h"
 
-/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
-#ifdef _MSC_VER
-#define FLAC__U64L(x) x
-#else
-#define FLAC__U64L(x) x##LLU
-#endif
-
 
 /* technically this should be in an "export.c" but this is convenient enough */
 FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC =

diff --git a/src/test_libFLAC/bitwriter.c b/src/test_libFLAC/bitwriter.c
index e0e3286..fa516d2 100644 (file)
--- a/src/test_libFLAC/bitwriter.c
+++ b/src/test_libFLAC/bitwriter.c
@@ -21,18 +21,12 @@
 #endif
 
 #include "FLAC/assert.h"
+#include "share/compat.h"
 #include "private/bitwriter.h" /* from the libFLAC private include area */
 #include "bitwriter.h"
 #include <stdio.h>
 #include <string.h> /* for memcmp() */
 
-/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
-#ifdef _MSC_VER
-#define FLAC__U64L(x) x
-#else
-#define FLAC__U64L(x) x##LLU
-#endif
-
 /*
  * WATCHOUT!  Since FLAC__BitWriter is a private structure, we use a copy of
  * the definition here to get at the internals.  Make sure this is kept up