From 71ae6d47147ed7b02db4b7025534c69e3e33a18f Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Sun, 27 Jun 2010 21:55:08 -0400
Subject: [PATCH] Some C90-ication
---
libcelt/celt.c | 3 +--
libcelt/dump_modes.c | 1 -
libcelt/ecintrin.h | 25 -------------------------
3 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/libcelt/celt.c b/libcelt/celt.c
index 19f4026f9..fe3b56279 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -634,7 +634,7 @@ static int tf_analysis(celt_word16 *bandLogE, celt_word16 *oldBandE, int len, in
else
tf_res[i] = path0[i+1];
}
- RESTORE_STACK
+ RESTORE_STACK;
return tf_select;
}
@@ -1466,7 +1466,6 @@ static void celt_decode_lost(CELTDecoder * restrict st, celt_word16 * restrict p
int overlap = st->mode->overlap;
celt_word16 fade = Q15ONE;
int i, len;
- VARDECL(celt_sig, freq);
const int C = CHANNELS(st->channels);
int offset;
SAVE_STACK;
diff --git a/libcelt/dump_modes.c b/libcelt/dump_modes.c
index 0b8399788..86aa796a0 100644
--- a/libcelt/dump_modes.c
+++ b/libcelt/dump_modes.c
@@ -156,7 +156,6 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
fprintf(file, "%d,\t/* nbAllocVectors */\n", mode->nbAllocVectors);
fprintf(file, "allocVectors%d_%d,\t/* allocVectors */\n", mode->Fs, mdctSize);
fprintf(file, "NULL,\t/* bits */\n");
- //fprintf(file, "allocCacheTop%d_%d,\t/* _bits */\n", mode->Fs, mode->mdctSize);
fprintf (file, "{ ");
for (k=0;(1<<k>>1)<=mode->nbShortMdcts;k++)
{
diff --git a/libcelt/ecintrin.h b/libcelt/ecintrin.h
index b0bed9f5c..54ae90a17 100644
--- a/libcelt/ecintrin.h
+++ b/libcelt/ecintrin.h
@@ -108,29 +108,4 @@
# define EC_ILOG(_x) (ec_ilog(_x))
#endif
-#ifdef __GNUC_PREREQ
-#if __GNUC_PREREQ(3,4)
-# if INT_MAX>=9223372036854775807
-# define EC_CLZ64_0 sizeof(unsigned)*CHAR_BIT
-# define EC_CLZ64(_x) (__builtin_clz(_x))
-# elif LONG_MAX>=9223372036854775807L
-# define EC_CLZ64_0 sizeof(unsigned long)*CHAR_BIT
-# define EC_CLZ64(_x) (__builtin_clzl(_x))
-# elif LLONG_MAX>=9223372036854775807LL
-# define EC_CLZ64_0 sizeof(unsigned long long)*CHAR_BIT
-# define EC_CLZ64(_x) (__builtin_clzll(_x))
-# endif
-#endif
-#endif
-
-#if defined(EC_CLZ64)
-/*Note that __builtin_clz is not defined when _x==0, according to the gcc
- documentation (and that of the BSR instruction that implements it on x86).
- The majority of the time we can never pass it zero.
- When we need to, it can be special cased.*/
-# define EC_ILOG64(_x) (EC_CLZ64_0-EC_CLZ64(_x))
-#else
-# define EC_ILOG64(_x) (ec_ilog64(_x))
-#endif
-
#endif
--
GitLab