generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am f861705f: am 5cd1efb2: am 1bd035cf: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"

Browse Source 
* commit 'f861705f8c64af968b542c23932994cd17bb5db9':
  Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
This commit is contained in:
Andrew Hsieh 2012-08-21 03:33:02 -07:00 committed by Android Git Automerger
commit 5e2aa357d2
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libm/arm/fenv.h
View File

@ -31,6 +31,8 @@
#include <sys/types.h> #include <sys/types.h>
__BEGIN_DECLS
typedef uint32_t fenv_t; typedef uint32_t fenv_t;
typedef uint32_t fexcept_t; typedef uint32_t fexcept_t;
@ -50,7 +52,6 @@ typedef uint32_t fexcept_t;
#define FE_DOWNWARD 0x0003 #define FE_DOWNWARD 0x0003
#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \ #define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
FE_UPWARD | FE_TOWARDZERO) FE_UPWARD | FE_TOWARDZERO)
/* __BEGIN_DECLS */
/* Default floating-point environment */ /* Default floating-point environment */
extern const fenv_t __fe_dfl_env; extern const fenv_t __fe_dfl_env;
@ -212,6 +213,6 @@ fegetexcept(void)
#endif /* __BSD_VISIBLE */ #endif /* __BSD_VISIBLE */
/* __END_DECLS */ __END_DECLS
#endif /* !_FENV_H_ */ #endif /* !_FENV_H_ */

4
libm/include/i387/fenv.h
View File

@ -32,6 +32,8 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/_types.h> #include <sys/_types.h>
__BEGIN_DECLS
/* /*
* To preserve binary compatibility with FreeBSD 5.3, we pack the * To preserve binary compatibility with FreeBSD 5.3, we pack the
* mxcsr into some reserved fields, rather than changing sizeof(fenv_t). * mxcsr into some reserved fields, rather than changing sizeof(fenv_t).
@ -65,8 +67,6 @@ typedef __uint16_t fexcept_t;
#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \ #define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
FE_UPWARD | FE_TOWARDZERO) FE_UPWARD | FE_TOWARDZERO)
__BEGIN_DECLS
/* Default floating-point environment */ /* Default floating-point environment */
extern const fenv_t __fe_dfl_env; extern const fenv_t __fe_dfl_env;
#define FE_DFL_ENV (&__fe_dfl_env) #define FE_DFL_ENV (&__fe_dfl_env)

6
libm/mips/fenv.h
View File

@ -29,8 +29,11 @@
#ifndef _FENV_H_ #ifndef _FENV_H_
#define _FENV_H_ #define _FENV_H_
#include <sys/cdefs.h>
#include <sys/_types.h> #include <sys/_types.h>
__BEGIN_DECLS
typedef __uint32_t fenv_t; typedef __uint32_t fenv_t;
typedef __uint32_t fexcept_t; typedef __uint32_t fexcept_t;
@ -50,7 +53,6 @@ typedef __uint32_t fexcept_t;
#define FE_DOWNWARD 0x0003 #define FE_DOWNWARD 0x0003
#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \ #define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
FE_UPWARD | FE_TOWARDZERO) FE_UPWARD | FE_TOWARDZERO)
/* __BEGIN_DECLS */
/* Default floating-point environment */ /* Default floating-point environment */
extern const fenv_t __fe_dfl_env; extern const fenv_t __fe_dfl_env;
@ -212,7 +214,7 @@ fegetexcept(void)
#endif /* __BSD_VISIBLE */ #endif /* __BSD_VISIBLE */
/* __END_DECLS */ __END_DECLS
#endif /* !_FENV_H_ */ #endif /* !_FENV_H_ */