devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Adding a slightly painful workaround to silence a compiler warning.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10636 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2006-08-17 17:13:56 +00:00
parent e5f1fe93b5
commit f70e45ac29
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/codecs/libmad/synth.c
View file

@ -29,6 +29,20 @@
# include "frame.h" # include "frame.h"
# include "synth.h" # include "synth.h"
/*
* This is a slightly painful workaround to silence a warning that happens
* with 4.1 if the const is used and with <= 4.0 if the const is not used.
* So in a bright future when we are >= 4.1 only we can remove this kludge
* again.
*/
#if ((__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ < 1)))
/* before gcc 4.1 */
#define CONST_TO_CONST_STRUCT_FIELD const
#else
/* after and including gcc 4.1 */
#define CONST_TO_CONST_STRUCT_FIELD
#endif
/* /*
* NAME: synth->init() * NAME: synth->init()
* DESCRIPTION: initialize synth struct * DESCRIPTION: initialize synth struct
@ -825,7 +839,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
int p; int p;
unsigned int phase, ch, s, sb; unsigned int phase, ch, s, sb;
mad_fixed_t *pcm, (*filter)[2][2][16][8]; mad_fixed_t *pcm, (*filter)[2][2][16][8];
mad_fixed_t const (*sbsample)[36][32]; mad_fixed_t CONST_TO_CONST_STRUCT_FIELD (*sbsample)[36][32];
mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8]; mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
mad_fixed_t const (*D0ptr)[32], *ptr; mad_fixed_t const (*D0ptr)[32], *ptr;
mad_fixed_t const (*D1ptr)[32]; mad_fixed_t const (*D1ptr)[32];
@ -1033,7 +1047,7 @@ void synth_half(struct mad_synth *synth, struct mad_frame const *frame,
{ {
unsigned int phase, ch, s, sb, pe, po; unsigned int phase, ch, s, sb, pe, po;
mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8]; mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8];
mad_fixed_t const (*sbsample)[36][32]; mad_fixed_t CONST_TO_CONST_STRUCT_FIELD (*sbsample)[36][32];
register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8]; register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
register mad_fixed_t const (*Dptr)[32], *ptr; register mad_fixed_t const (*Dptr)[32], *ptr;
register mad_fixed64hi_t hi; register mad_fixed64hi_t hi;