Revert parts of 96d081c1 that touched source code or autotools files.

[platform/upstream/flac.git] / src / libFLAC / float.c

diff --git a/src/libFLAC/float.c b/src/libFLAC/float.c
index a0b4617..d411e4e 100644 (file)
--- a/src/libFLAC/float.c
+++ b/src/libFLAC/float.c
@@ -1,5 +1,5 @@
 /* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2004  Josh Coalson
+ * Copyright (C) 2004,2005,2006,2007,2008,2009  Josh Coalson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,19 +29,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "FLAC/assert.h"
+#if 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;
@@ -278,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;