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.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27699 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 2 insertions, 15 deletions

diff --git a/configure b/configure
index e418f95303..86b436061d 100755
--- a/configure
+++ b/configure
@@ -2927,17 +2927,6 @@ fi
 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 @@ $_def_confwin32
 /* Define this to any prefered value from 386 up to infinity with step 100 */
 #define __CPU__ $iproc
 
-$_mp_wordsize
-
 $_def_vcd
 
 #ifdef sun
diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c
index d2fcb48dbe..6c97463f4b 100644
--- a/libmpcodecs/vf_divtc.c
+++ b/libmpcodecs/vf_divtc.c
@@ -128,7 +128,7 @@ static unsigned int checksum_plane(unsigned char *p, unsigned char *z,
    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 @@ static unsigned int checksum_plane(unsigned char *p, unsigned char *z,
       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);