Mercurial > mplayer.hg
changeset 27667:88dfab272467
Remove word size check and macro and use __WORDSIZE directly instead.
It has been done this way in libswscale for years without apparent ill effect.
| author | diego |
|---|---|
| date | Sat, 04 Oct 2008 10:16:48 +0000 |
| parents | 9936b7fa9e63 |
| children | 216f4d0f0de8 |
| files | configure libmpcodecs/vf_divtc.c |
| diffstat | 2 files changed, 2 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Oct 04 09:52:07 2008 +0000 +++ b/configure Sat Oct 04 10:16:48 2008 +0000 @@ -2927,17 +2927,6 @@ echores "$_fast_inttypes" -echocheck "word size" -_mp_wordsize="#undef MP_WORDSIZE" -cat > $TMPC << EOF -#include <stdio.h> -#include <sys/types.h> -int main(void) { printf("%d\n", sizeof(size_t)*8); return 0; } -EOF -cc_check && _wordsize=`$TMPEXE` && _mp_wordsize="#define MP_WORDSIZE $_wordsize" -echores "$_wordsize" - - echocheck "malloc.h" cat > $TMPC << EOF #include <malloc.h> @@ -8500,8 +8489,6 @@ /* Define this to any prefered value from 386 up to infinity with step 100 */ #define __CPU__ $iproc -$_mp_wordsize - $_def_vcd #ifdef sun
--- a/libmpcodecs/vf_divtc.c Sat Oct 04 09:52:07 2008 +0000 +++ b/libmpcodecs/vf_divtc.c Sat Oct 04 10:16:48 2008 +0000 @@ -128,7 +128,7 @@ unsigned int shift; uint32_t sum, t; unsigned char *e, *e2; -#if MP_WORDSIZE==64 +#if __WORDSIZE==64 typedef uint64_t wsum_t; #else typedef uint32_t wsum_t; @@ -143,7 +143,7 @@ for(wsum=0, e2=e-sizeof(wsum_t)+1; p<e2; p+=sizeof(wsum_t)) wsum^=*(wsum_t *)p; -#if MP_WORDSIZE==64 +#if __WORDSIZE==64 t=be2me_32((uint32_t)(wsum>>32^wsum)); #else t=be2me_32(wsum);