summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-11-28 21:09:47 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-11-28 21:09:47 +0100
commit57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch)
tree5466406472918d3adb63398f5fb9ea1511a5e73f /include
parent4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff)
parent5dea871ac73ef4608022c058b50adc946917f9b9 (diff)
Merge commit 'origin/master' into prelink
Conflicts: ldso/include/dl-hash.h Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'include')
-rw-r--r--include/complex.h10
-rw-r--r--include/internal/parse_config.h4
-rw-r--r--include/math.h52
3 files changed, 34 insertions, 32 deletions
diff --git a/include/complex.h b/include/complex.h
index 94fb6ea44..8779bbcd0 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -54,13 +54,13 @@ __BEGIN_DECLS
so we can easily declare each function as both `name' and `__name',
and can declare the float versions `namef' and `__namef'. */
-#define __MATHCALL(function, args) \
- __MATHDECL (_Mdouble_complex_,function, args)
+#define __MATHCALL(function, args) \
+ __MATHDECL(_Mdouble_complex_,function, args)
#define __MATHDECL(type, function, args) \
- __MATHDECL_1(type, function, args); \
- __MATHDECL_1(type, __CONCAT(__,function), args)
+ __MATHDECL_1(type, function, args); \
+ __MATHDECL_1(type, __CONCAT(__,function), args)
#define __MATHDECL_1(type, function, args) \
- extern type __MATH_PRECNAME(function) args __THROW
+ extern type __MATH_PRECNAME(function) args __THROW
#define _Mdouble_ double
#define __MATH_PRECNAME(name) name
diff --git a/include/internal/parse_config.h b/include/internal/parse_config.h
index 47a74fa75..ebfb87e5f 100644
--- a/include/internal/parse_config.h
+++ b/include/internal/parse_config.h
@@ -44,10 +44,14 @@ typedef struct parser_t {
size_t line_len; /* length of line */
smalluint allocated;
} parser_t;
+
parser_t* config_open(const char *filename) FAST_FUNC attribute_hidden;
+libc_hidden_proto(config_open)
int config_read(parser_t *parser, char ***tokens, unsigned flags, const char *delims) FAST_FUNC attribute_hidden;
+libc_hidden_proto(config_read)
#define config_read(parser, tokens, max, min, str, flags) \
config_read(parser, tokens, ((flags) | (((min) & 0xFF) << 8) | ((max) & 0xFF)), str)
void config_close(parser_t *parser) FAST_FUNC attribute_hidden;
+libc_hidden_proto(config_close)
#endif /* __INTERNAL_PARSE_CONFIG_H */
diff --git a/include/math.h b/include/math.h
index 91ebd64bb..d3f86f9c1 100644
--- a/include/math.h
+++ b/include/math.h
@@ -53,40 +53,40 @@ __BEGIN_DECLS
and can declare the float versions `namef' and `__namef'. */
#define __MATHDECL_1(type,function,suffix,args) \
- extern type __MATH_PRECNAME(function,suffix) args __THROW
+ extern type __MATH_PRECNAME(function,suffix) args __THROW
#define __MATHDECL(type,function,suffix,args) \
- __MATHDECL_1(type,function,suffix,args);
+ __MATHDECL_1(type,function,suffix,args);
-#define __MATHCALL(function,suffix,args) \
- __MATHDECL(_Mdouble_,function,suffix,args)
+#define __MATHCALL(function,suffix,args) \
+ __MATHDECL(_Mdouble_,function,suffix,args)
#define __MATHDECLX(type,function,suffix,args,attrib) \
- __MATHDECL_1(type,function,suffix,args) __attribute__ (attrib); \
- __MATH_maybe_libm_hidden_proto(function)
+ __MATHDECL_1(type,function,suffix,args) __attribute__ (attrib); \
+ __MATH_maybe_libm_hidden_proto(function)
-#define __MATHCALLX(function,suffix,args,attrib) \
- __MATHDECLX(_Mdouble_,function,suffix,args,attrib)
+#define __MATHCALLX(function,suffix,args,attrib) \
+ __MATHDECLX(_Mdouble_,function,suffix,args,attrib)
/* Decls which are also used internally in libm.
Only the main variant is used internally, no need to try to avoid relocs
for the {l,f} variants. */
#define __MATHDECLI(type,function,suffix,args) \
- __MATHDECL_1(type,function,suffix,args); \
- __MATH_maybe_libm_hidden_proto(function)
+ __MATHDECL_1(type,function,suffix,args); \
+ __MATH_maybe_libm_hidden_proto(function)
-#define __MATHCALLI(function,suffix,args) \
- __MATHDECLI(_Mdouble_,function,suffix,args)
+#define __MATHCALLI(function,suffix,args) \
+ __MATHDECLI(_Mdouble_,function,suffix,args)
/* Private helpers for purely macro impls below.
Only make __foo{,f,l} visible but not (the macro-only) foo. */
#if defined _LIBC
# define __MATHDECL_PRIV(type,function,suffix,args,attrib) \
- __MATHDECL_1(type,__CONCAT(__,function),suffix,args) __attribute__ (attrib); \
- libm_hidden_proto(__MATH_PRECNAME(__##function,suffix))
+ __MATHDECL_1(type,__CONCAT(__,function),suffix,args) __attribute__ (attrib); \
+ libm_hidden_proto(__MATH_PRECNAME(__##function,suffix))
#else
# define __MATHDECL_PRIV(type,function,suffix,args,attrib) \
- __MATHDECL_1(type,__CONCAT(__,function),suffix,args) __attribute__ (attrib);
+ __MATHDECL_1(type,__CONCAT(__,function),suffix,args) __attribute__ (attrib);
#endif
@@ -139,17 +139,15 @@ __BEGIN_DECLS
# ifdef __LDBL_COMPAT
# ifdef __USE_ISOC99
-extern float __nldbl_nexttowardf (float __x, long double __y)
- __THROW __attribute__ ((__const__));
+extern float __nldbl_nexttowardf (float __x, long double __y) __THROW
+ __attribute__ ((__const__));
# ifdef __REDIRECT_NTH
-extern float __REDIRECT_NTH (nexttowardf, (float __x, long double __y),
- __nldbl_nexttowardf)
- __attribute__ ((__const__));
-extern double __REDIRECT_NTH (nexttoward, (double __x, long double __y),
- nextafter) __attribute__ ((__const__));
-extern long double __REDIRECT_NTH (nexttowardl,
- (long double __x, long double __y),
- nextafter) __attribute__ ((__const__));
+extern float __REDIRECT_NTH (nexttowardf, (float __x, long double __y), __nldbl_nexttowardf)
+ __attribute__ ((__const__));
+extern double __REDIRECT_NTH (nexttoward, (double __x, long double __y), nextafter)
+ __attribute__ ((__const__));
+extern long double __REDIRECT_NTH (nexttowardl, (long double __x, long double __y), nextafter)
+ __attribute__ ((__const__));
# endif
# endif
@@ -158,9 +156,9 @@ extern long double __REDIRECT_NTH (nexttowardl,
# undef __MATHDECL_1
# define __MATHDECL_2(type,function,suffix,args,alias) \
- extern type __REDIRECT_NTH(__MATH_PRECNAME(function,suffix),args,alias)
+ extern type __REDIRECT_NTH(__MATH_PRECNAME(function,suffix),args,alias)
# define __MATHDECL_1(type,function,suffix,args) \
- __MATHDECL_2(type,function,suffix,args,__CONCAT(function,suffix))
+ __MATHDECL_2(type,function,suffix,args,__CONCAT(function,suffix))
# endif
# define __MATH_maybe_libm_hidden_proto(x)