]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Use IS_IN internally only siddhesh/is_in_module
authorSiddhesh Poyarekar <siddhesh@redhat.com>
Mon, 1 Sep 2014 17:25:04 +0000 (22:55 +0530)
committerSiddhesh Poyarekar <siddhesh@redhat.com>
Wed, 5 Nov 2014 10:48:54 +0000 (16:18 +0530)
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.

include/bits/stdlib-float.h
include/mqueue.h

index 346631482d61f7a130ab66f6fc191b94116a3649..54ab57198165d10728f7d59ec87dc77970ae4903 100644 (file)
@@ -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
index aba788e8037684dfa6f7f0c99c4967a082f51c05..eb47b9b34e17605d6f163f07d972a21081c6892d 100644 (file)
@@ -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