Index: src/libFLAC/float.c |
diff --git a/src/libFLAC/float.c b/src/libFLAC/float.c |
index 8e19280207bced78c9b3afe37ca8d076295d218d..068069f36026aa74b0947b403539c9b9900ab433 100644 |
--- a/src/libFLAC/float.c |
+++ b/src/libFLAC/float.c |
@@ -1,5 +1,6 @@ |
/* libFLAC - Free Lossless Audio Codec library |
- * Copyright (C) 2004,2005,2006,2007 Josh Coalson |
+ * Copyright (C) 2004-2009 Josh Coalson |
+ * Copyright (C) 2011-2014 Xiph.Org Foundation |
* |
* Redistribution and use in source and binary forms, with or without |
* modification, are permitted provided that the following conditions |
@@ -29,23 +30,16 @@ |
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#if HAVE_CONFIG_H |
+#ifdef HAVE_CONFIG_H |
# include <config.h> |
#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 +276,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; |