commit e33454051677cd8953af558b67e525dda2231501
author Elliott Hughes <enh@google.com> Fri Feb 28 02:16:40 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 28 02:16:40 2014 +0000
tree 9bd7b33a9d19b9a32bb6164e58bbb003d888b501
parent ad2cfe2f231506aed955f7e168a25fe1a1040f9a
parent 3073f90b17b1d2899b036e2c45ba5324f8c34298

Merge "Fix a leak on error in tzload."

libm/amd64/fenv.c

diff --git a/libm/amd64/fenv.c b/libm/amd64/fenv.c
index b2c017b..b058de2 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 */

libm/include/amd64/machine/fenv.h

diff --git a/libm/include/amd64/machine/fenv.h b/libm/include/amd64/machine/fenv.h
index f22a931..79a4120 100644
--- a/libm/include/amd64/machine/fenv.h
+++ b/libm/include/amd64/machine/fenv.h
@@ -97,7 +97,7 @@
  * 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