[PATCH 17/19 v3] Use IS_IN only when _LIBC is defined

[Siddhesh Poyarekar <siddhesh at redhat dot com>]

On Thu, Aug 28, 2014 at 04:58:26PM +0000, Joseph S. Myers wrote:
> Normally, #ifndef _ISOMAC would be the conditional around such extra 
> internal-only contents (and then #if IS_IN (librt) could go inside the 
> !_ISOMAC case).

Thanks, I wasn't clear about the _ISOMAC macro usage.  Updated patch,
no change in generated code and the conformtests are fixed.

Siddhesh
    
	* include/bits/stdlib-float.h: Use IS_IN only if _LIBC is
	defined.
	* include/mqueue.h: Likewise.
	* include/stdlib.h: Likewise.

diff --git a/include/bits/stdlib-float.h b/include/bits/stdlib-float.h
index 3466314..54ab571 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 aba788e..eb47b9b 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

Attachment: pgpo22cxKKPXQ.pgp
Description: PGP signature