From 7ba84d3108a65bc69e121f82b4ff747fb203d049 Mon Sep 17 00:00:00 2001 From: Pavel Chupin Date: Fri, 28 Feb 2014 00:36:10 +0400 Subject: [PATCH] Fix x86_64 build Fix types after recent update: https://android-review.googlesource.com/#/c/83435/ Change-Id: I17ed28af84b7adeb8572e18834e66f3264ec061d Signed-off-by: Pavel Chupin --- libm/amd64/fenv.c | 2 +- libm/include/amd64/machine/fenv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libm/amd64/fenv.c b/libm/amd64/fenv.c index b2c017be8..b058de29c 100755 --- a/libm/amd64/fenv.c +++ b/libm/amd64/fenv.c @@ -42,7 +42,7 @@ * x87 fpu registers are 16bit wide. The upper bits, 31-16, are marked as * RESERVED. */ -fenv_t __fe_dfl_env = { +const fenv_t __fe_dfl_env = { { 0xffff0000 | __INITIAL_NPXCW__, /* Control word register */ 0xffff0000, /* Status word register */ diff --git a/libm/include/amd64/machine/fenv.h b/libm/include/amd64/machine/fenv.h index f22a931f5..79a4120d9 100644 --- a/libm/include/amd64/machine/fenv.h +++ b/libm/include/amd64/machine/fenv.h @@ -97,7 +97,7 @@ typedef struct { * A floating-point control mode is a system variable whose value may be set by * the user to affect the subsequent behavior of floating-point arithmetic. */ -typedef __uint_32 fexcept_t; +typedef __uint32_t fexcept_t; __END_DECLS