[ping,17/17,v3] Use IS_IN internally only
diff mbox

Message ID 20140917125543.GX6586@spoyarek.pnq.redhat.com
State New
Headers show

Commit Message

Siddhesh Poyarekar Sept. 17, 2014, 12:55 p.m. UTC
Rebased patch against latest master.  The patch has not changed.

Siddhesh

From f45abf4b96388f82ba2cb7cba8548aa71a8e607d Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 1 Sep 2014 22:55:04 +0530
Subject: [PATCH] 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 [_ISOMAC || !IS_IN (rtld)]:
	Include bits/stdlib-float.h.
	* include/mqueue.h: Use internal code only when _ISOMAC is not
	defined.
---
 include/bits/stdlib-float.h | 8 ++++++--
 include/mqueue.h            | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

Comments

Siddhesh Poyarekar Sept. 24, 2014, 9:07 a.m. UTC | #1
Ping!

On Wed, Sep 17, 2014 at 06:25:43PM +0530, Siddhesh Poyarekar wrote:
> Rebased patch against latest master.  The patch has not changed.
> 
> Siddhesh
> 
> From f45abf4b96388f82ba2cb7cba8548aa71a8e607d Mon Sep 17 00:00:00 2001
> From: Siddhesh Poyarekar <siddhesh@redhat.com>
> Date: Mon, 1 Sep 2014 22:55:04 +0530
> Subject: [PATCH] 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 [_ISOMAC || !IS_IN (rtld)]:
> 	Include bits/stdlib-float.h.
> 	* include/mqueue.h: Use internal code only when _ISOMAC is not
> 	defined.
> ---
>  include/bits/stdlib-float.h | 8 ++++++--
>  include/mqueue.h            | 4 +++-
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> 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
> -- 
> 1.9.3
>
Joseph Myers Sept. 24, 2014, 9:16 a.m. UTC | #2
This patch is OK.

Patch
diff mbox

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