diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-09-16 08:59:41 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-09-16 08:59:41 +0000 |
commit | baf5494341cdd6cdb9590e21d429920b9bc4a2c6 (patch) | |
tree | 65105da572f60170a9c710ffc93cd57683f66060 | |
parent | 8fe4507dc76e6f5b5fa764bb307241d5d0af5d1b (diff) | |
download | rockbox-baf5494341cdd6cdb9590e21d429920b9bc4a2c6.tar.gz rockbox-baf5494341cdd6cdb9590e21d429920b9bc4a2c6.zip |
Reverted workaround for the gcc warning. There was a change of behaviour in an early development snapshot of gcc 4.1.2, which was reverted later. The workaround triggered the warning it should fix in later gcc 4.1.2 snapshots.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10957 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/libmad/synth.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/apps/codecs/libmad/synth.c b/apps/codecs/libmad/synth.c index 8f535ec62a..2da8f64db7 100644 --- a/apps/codecs/libmad/synth.c +++ b/apps/codecs/libmad/synth.c | |||
@@ -30,20 +30,6 @@ | |||
30 | # include "synth.h" | 30 | # include "synth.h" |
31 | 31 | ||
32 | /* | 32 | /* |
33 | * This is a slightly painful workaround to silence a warning that happens | ||
34 | * with 4.1 if the const is used and with <= 4.0 if the const is not used. | ||
35 | * So in a bright future when we are >= 4.1 only we can remove this kludge | ||
36 | * again. | ||
37 | */ | ||
38 | #if ((__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ < 1))) | ||
39 | /* before gcc 4.1 */ | ||
40 | #define CONST_TO_CONST_STRUCT_FIELD const | ||
41 | #else | ||
42 | /* after and including gcc 4.1 */ | ||
43 | #define CONST_TO_CONST_STRUCT_FIELD | ||
44 | #endif | ||
45 | |||
46 | /* | ||
47 | * NAME: synth->init() | 33 | * NAME: synth->init() |
48 | * DESCRIPTION: initialize synth struct | 34 | * DESCRIPTION: initialize synth struct |
49 | */ | 35 | */ |
@@ -839,7 +825,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame, | |||
839 | int p; | 825 | int p; |
840 | unsigned int phase, ch, s, sb; | 826 | unsigned int phase, ch, s, sb; |
841 | mad_fixed_t *pcm, (*filter)[2][2][16][8]; | 827 | mad_fixed_t *pcm, (*filter)[2][2][16][8]; |
842 | mad_fixed_t CONST_TO_CONST_STRUCT_FIELD (*sbsample)[36][32]; | 828 | mad_fixed_t const (*sbsample)[36][32]; |
843 | mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8]; | 829 | mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8]; |
844 | mad_fixed_t const (*D0ptr)[32], *ptr; | 830 | mad_fixed_t const (*D0ptr)[32], *ptr; |
845 | mad_fixed_t const (*D1ptr)[32]; | 831 | mad_fixed_t const (*D1ptr)[32]; |
@@ -1047,7 +1033,7 @@ void synth_half(struct mad_synth *synth, struct mad_frame const *frame, | |||
1047 | { | 1033 | { |
1048 | unsigned int phase, ch, s, sb, pe, po; | 1034 | unsigned int phase, ch, s, sb, pe, po; |
1049 | mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8]; | 1035 | mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8]; |
1050 | mad_fixed_t CONST_TO_CONST_STRUCT_FIELD (*sbsample)[36][32]; | 1036 | mad_fixed_t const (*sbsample)[36][32]; |
1051 | register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8]; | 1037 | register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8]; |
1052 | register mad_fixed_t const (*Dptr)[32], *ptr; | 1038 | register mad_fixed_t const (*Dptr)[32], *ptr; |
1053 | register mad_fixed64hi_t hi; | 1039 | register mad_fixed64hi_t hi; |