diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-24 15:24:34 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-24 15:24:34 +0530 |
| commit | 7a9ebfa159f392fcf1c3aa172fc5bd6bd1eeea63 (patch) | |
| tree | 313403a4ef8f585ad087f58734efe74dd872e89c | |
| parent | 4f41c682f3f0a0ad69eeac38a6b270f4362c3a02 (diff) | |
| download | glibc-7a9ebfa159f392fcf1c3aa172fc5bd6bd1eeea63.tar.gz glibc-7a9ebfa159f392fcf1c3aa172fc5bd6bd1eeea63.tar.xz glibc-7a9ebfa159f392fcf1c3aa172fc5bd6bd1eeea63.zip | |
Use IS_IN internally only
This change is only useful for the conformance tests since the headers changed are not installed. The conformance tests fail due to IS_IN not being defined, so wrap it with a check to make sure that _ISOMAC is defined. * include/bits/stdlib-float.h: Use IS_IN only if _ISOMAC is defined. * include/mqueue.h: Likewise. * include/stdlib.h: Likewise.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/bits/stdlib-float.h | 8 | ||||
| -rw-r--r-- | include/mqueue.h | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 8362e08557..bf7998bdf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-11-24 Siddhesh Poyarekar <siddhesh@redhat.com> + * include/bits/stdlib-float.h: Use IS_IN only if _ISOMAC is + defined. + * include/mqueue.h: Likewise. + * include/stdlib.h: Likewise. + * stdlib/isomac.c (fmt): Replace NOT_IN_libc with IN_MODULE. (get_null_defines): Adjust. * sunrpc/Makefile: Adjust comment. diff --git a/include/bits/stdlib-float.h b/include/bits/stdlib-float.h index 346631482d..54ab571981 100644 --- a/include/bits/stdlib-float.h +++ b/include/bits/stdlib-float.h @@ -1,4 +1,8 @@ -/* No floating-point inline functions in rtld. */ -#if !IS_IN (rtld) +/* No floating-point inline functions in rtld and for the conform tests. */ +#ifdef _ISOMAC # include <stdlib/bits/stdlib-float.h> +#else +# if !IS_IN (rtld) +# include <stdlib/bits/stdlib-float.h> +# endif #endif diff --git a/include/mqueue.h b/include/mqueue.h index aba788e803..eb47b9b34e 100644 --- a/include/mqueue.h +++ b/include/mqueue.h @@ -1,7 +1,9 @@ #include <rt/mqueue.h> -#if IS_IN (librt) +#ifndef _ISOMAC +# if IS_IN (librt) hidden_proto (mq_timedsend) hidden_proto (mq_timedreceive) hidden_proto (mq_setattr) +# endif #endif |