Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
diff --git a/ndk/platforms/android-3/arch-arm/include/fenv.h b/ndk/platforms/android-3/arch-arm/include/fenv.h
index 893a596..534b12c 100644
--- a/ndk/platforms/android-3/arch-arm/include/fenv.h
+++ b/ndk/platforms/android-3/arch-arm/include/fenv.h
@@ -31,6 +31,8 @@
#include <sys/types.h>
+__BEGIN_DECLS
+
typedef uint32_t fenv_t;
typedef uint32_t fexcept_t;
@@ -50,7 +52,6 @@
#define FE_DOWNWARD 0x0003
#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
FE_UPWARD | FE_TOWARDZERO)
-/* __BEGIN_DECLS */
/* Default floating-point environment */
extern const fenv_t __fe_dfl_env;
@@ -212,6 +213,6 @@
#endif /* __BSD_VISIBLE */
-/* __END_DECLS */
+__END_DECLS
#endif /* !_FENV_H_ */
diff --git a/ndk/platforms/android-9/arch-mips/include/fenv.h b/ndk/platforms/android-9/arch-mips/include/fenv.h
index 061a696..583d002 100644
--- a/ndk/platforms/android-9/arch-mips/include/fenv.h
+++ b/ndk/platforms/android-9/arch-mips/include/fenv.h
@@ -29,8 +29,11 @@
#ifndef _FENV_H_
#define _FENV_H_
+#include <sys/cdefs.h>
#include <sys/_types.h>
+__BEGIN_DECLS
+
typedef __uint32_t fenv_t;
typedef __uint32_t fexcept_t;
@@ -50,7 +53,6 @@
#define FE_DOWNWARD 0x0003
#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
FE_UPWARD | FE_TOWARDZERO)
-/* __BEGIN_DECLS */
/* Default floating-point environment */
extern const fenv_t __fe_dfl_env;
@@ -212,7 +214,7 @@
#endif /* __BSD_VISIBLE */
-/* __END_DECLS */
+__END_DECLS
#endif /* !_FENV_H_ */
diff --git a/ndk/platforms/android-9/arch-x86/include/fenv.h b/ndk/platforms/android-9/arch-x86/include/fenv.h
index 710494c..4e322b7 100644
--- a/ndk/platforms/android-9/arch-x86/include/fenv.h
+++ b/ndk/platforms/android-9/arch-x86/include/fenv.h
@@ -32,6 +32,8 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
+__BEGIN_DECLS
+
/*
* To preserve binary compatibility with FreeBSD 5.3, we pack the
* mxcsr into some reserved fields, rather than changing sizeof(fenv_t).
@@ -65,8 +67,6 @@
#define _ROUND_MASK (FE_TONEAREST | FE_DOWNWARD | \
FE_UPWARD | FE_TOWARDZERO)
-__BEGIN_DECLS
-
/* Default floating-point environment */
extern const fenv_t __fe_dfl_env;
#define FE_DFL_ENV (&__fe_dfl_env)
