aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-09-01 22:55:04 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-11-05 16:18:54 +0530
commit06195e5139c9136ed81c299562395a9f9f9f64df (patch)
treefcc2a1aab6fb82d21526ade637105e4c70d5a906
parent0c2927d48f779aec107def1e3ee47adf54fefc8d (diff)
downloadtermbaud-siddhesh/is_in_module.tar.gz
termbaud-siddhesh/is_in_module.tar.xz
termbaud-siddhesh/is_in_module.zip
Use IS_IN internally onlysiddhesh/is_in_module
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--include/bits/stdlib-float.h8
-rw-r--r--include/mqueue.h4
2 files changed, 9 insertions, 3 deletions
diff --git a/include/bits/stdlib-float.h b/include/bits/stdlib-float.h
index 346631482d6..54ab5719816 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 aba788e8037..eb47b9b34e1 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