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.

diff --git a/ChangeLog b/ChangeLog
index 8362e08557326151761ce03979247b2640294916..bf7998bdf600704f38fbcee27d7080ae1a83d652 100644 (file)
--- 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 346631482d61f7a130ab66f6fc191b94116a3649..54ab57198165d10728f7d59ec87dc77970ae4903 100644 (file)
--- 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 aba788e8037684dfa6f7f0c99c4967a082f51c05..eb47b9b34e17605d6f163f07d972a21081c6892d 100644 (file)
--- 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