From: Andrew Morton "ISO C90 forbids mixed declarations and code" Cc: Eric W. Biederman Signed-off-by: Andrew Morton --- include/asm-i386/uaccess.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN include/asm-i386/uaccess.h~i386-add-a-temporary-to-make-put_user-more-type-safe-fix include/asm-i386/uaccess.h --- devel/include/asm-i386/uaccess.h~i386-add-a-temporary-to-make-put_user-more-type-safe-fix 2006-01-29 16:24:24.000000000 -0800 +++ devel-akpm/include/asm-i386/uaccess.h 2006-01-29 16:24:24.000000000 -0800 @@ -197,8 +197,9 @@ extern void __put_user_8(void); #define put_user(x,ptr) \ ({ int __ret_pu; \ + __typeof__(*(ptr)) __pu_val; \ __chk_user_ptr(ptr); \ - __typeof__(*(ptr)) __pu_val = x; \ + __pu_val = x; \ switch(sizeof(*(ptr))) { \ case 1: __put_user_1(__pu_val, ptr); break; \ case 2: __put_user_2(__pu_val, ptr); break; \ _