From 3a40407c06a470f5b15a4df310ab135233ac6109 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 29 Dec 2008 13:55:44 +0000 Subject: - expand SUSv3_LEGACY - SUSv4_LEGACY part #1 (non-networking) --- include/signal.h | 2 +- include/stdlib.h | 2 ++ include/tgmath.h | 2 ++ include/unistd.h | 3 ++- include/wchar.h | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/signal.h b/include/signal.h index b42800f51..d10463068 100644 --- a/include/signal.h +++ b/include/signal.h @@ -128,7 +128,7 @@ extern __sighandler_t __REDIRECT_NTH (signal, #endif __END_NAMESPACE_STD -#ifdef __USE_XOPEN +#if defined __USE_XOPEN && defined __UCLIBC_SUSV3_LEGACY__ /* The X/Open definition of `signal' conflicts with the BSD version. So they defined another function `bsd_signal'. */ extern __sighandler_t bsd_signal (int __sig, __sighandler_t __handler) diff --git a/include/stdlib.h b/include/stdlib.h index 87b284639..124dc7329 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -598,11 +598,13 @@ extern int clearenv (void) __THROW; #if defined __USE_MISC || defined __USE_XOPEN_EXTENDED +# if defined __UCLIBC_SUSV3_LEGACY__ /* Generate a unique temporary file name from TEMPLATE. The last six characters of TEMPLATE must be "XXXXXX"; they are replaced with a string that makes the file name unique. Returns TEMPLATE, or a null pointer if it cannot get a unique file name. */ extern char *mktemp (char *__template) __THROW __nonnull ((1)) __wur; +# endif /* Generate a unique temporary file name from TEMPLATE. The last six characters of TEMPLATE must be "XXXXXX"; diff --git a/include/tgmath.h b/include/tgmath.h index 685a34588..b3a546d17 100644 --- a/include/tgmath.h +++ b/include/tgmath.h @@ -376,6 +376,7 @@ /* Return the remainder of integer divison X / Y with infinite precision. */ #define remainder(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, remainder) +#if defined __UCLIBC_SUSV3_LEGACY__ /* Return X times (2 to the Nth power). */ #if defined __USE_MISC || defined __USE_XOPEN_EXTENDED # define scalb(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, scalb) @@ -387,6 +388,7 @@ /* Return X times (2 to the Nth power). */ #define scalbln(Val1, Val2) \ __TGMATH_BINARY_FIRST_REAL_ONLY (Val1, Val2, scalbln) +#endif /* UCLIBC_SUSV3_LEGACY */ /* Return the binary exponent of X, which must be nonzero. */ #define ilogb(Val) __TGMATH_UNARY_REAL_ONLY (Val, ilogb) diff --git a/include/unistd.h b/include/unistd.h index d028fbd5c..613fc9d8f 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -410,7 +410,8 @@ libc_hidden_proto(alarm) extern unsigned int sleep (unsigned int __seconds); libc_hidden_proto(sleep) -#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +#if (defined __USE_BSD || defined __USE_XOPEN_EXTENDED) \ + && defined __UCLIBC_SUSV3_LEGACY__ /* Set an alarm to go off (generating a SIGALRM signal) in VALUE microseconds. If INTERVAL is nonzero, when the alarm goes off, the timer is reset to go off every INTERVAL microseconds thereafter. diff --git a/include/wchar.h b/include/wchar.h index 5bf49b662..3795998a5 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -275,7 +275,7 @@ extern size_t wcslen (__const wchar_t *__s) __THROW __attribute_pure__; libc_hidden_proto(wcslen) __END_NAMESPACE_C99 -#ifdef __USE_XOPEN +#if defined __USE_XOPEN && defined __UCLIBC_SUSV3_LEGACY__ /* Another name for `wcsstr' from XPG4. */ extern wchar_t *wcswcs (__const wchar_t *__haystack, __const wchar_t *__needle) __THROW __attribute_pure__; -- cgit v1.2.3