diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-12 06:18:10 -0700 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-12 06:18:10 -0700 |
commit | 6cc4f58c6382c850ce97f32f56d1a3ff00ca4585 (patch) | |
tree | 19a2f25da5db93c2cb620c0da3c38d3bffd0b784 /include | |
parent | c58dd2b2aabda615aa333cdbb023defbf00b30a3 (diff) | |
parent | e90c33f951efc032ca23f48326343a83c0b54b10 (diff) |
Merge remote branch 'origin/master' into nptl
Conflicts:
libc/unistd/confstr.c
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/libc-symbols.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h index b2e0771fc..2800fe25c 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -86,9 +86,9 @@ #endif #if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -# define attribute_optimize(lvl) __attribute__ ((optimize(x))) +# define attribute_optimize(x) __attribute__ ((optimize(x))) #else -# define attribute_optimize(lvl) +# define attribute_optimize(x) #endif #define attribute_unused __attribute__ ((unused)) |