Merge "Fix x86_64 build"

This commit is contained in:
Calin Juravle 2014-02-27 21:31:13 +00:00 committed by Gerrit Code Review
commit ad2cfe2f23
2 changed files with 2 additions and 2 deletions

View File

@ -42,7 +42,7 @@
* x87 fpu registers are 16bit wide. The upper bits, 31-16, are marked as * x87 fpu registers are 16bit wide. The upper bits, 31-16, are marked as
* RESERVED. * RESERVED.
*/ */
fenv_t __fe_dfl_env = { const fenv_t __fe_dfl_env = {
{ {
0xffff0000 | __INITIAL_NPXCW__, /* Control word register */ 0xffff0000 | __INITIAL_NPXCW__, /* Control word register */
0xffff0000, /* Status word register */ 0xffff0000, /* Status word register */

View File

@ -97,7 +97,7 @@ typedef struct {
* A floating-point control mode is a system variable whose value may be set by * 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. * the user to affect the subsequent behavior of floating-point arithmetic.
*/ */
typedef __uint_32 fexcept_t; typedef __uint32_t fexcept_t;
__END_DECLS __END_DECLS