|
 |
bca718 |
commit 7a9ebfa159f392fcf1c3aa172fc5bd6bd1eeea63
|
|
|
bca718 |
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
|
|
|
bca718 |
Date: Mon Nov 24 15:24:34 2014 +0530
|
|
|
bca718 |
|
|
|
bca718 |
Use IS_IN internally only
|
|
|
bca718 |
|
|
|
bca718 |
This change is only useful for the conformance tests since the headers
|
|
|
bca718 |
changed are not installed. The conformance tests fail due to IS_IN
|
|
|
bca718 |
not being defined, so wrap it with a check to make sure that _ISOMAC
|
|
|
bca718 |
is defined.
|
|
|
bca718 |
|
|
|
bca718 |
* include/bits/stdlib-float.h: Use IS_IN only if _ISOMAC is
|
|
|
bca718 |
defined.
|
|
|
bca718 |
* include/mqueue.h: Likewise.
|
|
|
bca718 |
* include/stdlib.h: Likewise.
|
|
|
bca718 |
|
|
|
bca718 |
Index: glibc-2.17-c758a686/include/bits/stdlib-float.h
|
|
|
bca718 |
===================================================================
|
|
|
bca718 |
--- glibc-2.17-c758a686.orig/include/bits/stdlib-float.h
|
|
|
bca718 |
+++ glibc-2.17-c758a686/include/bits/stdlib-float.h
|
|
|
bca718 |
@@ -1,4 +1,8 @@
|
|
|
bca718 |
-/* No floating-point inline functions in rtld. */
|
|
|
bca718 |
-#if !IS_IN (rtld)
|
|
|
bca718 |
+/* No floating-point inline functions in rtld and for the conform tests. */
|
|
|
bca718 |
+#ifdef _ISOMAC
|
|
|
bca718 |
# include <stdlib/bits/stdlib-float.h>
|
|
|
bca718 |
+#else
|
|
|
bca718 |
+# if !IS_IN (rtld)
|
|
|
bca718 |
+# include <stdlib/bits/stdlib-float.h>
|
|
|
bca718 |
+# endif
|
|
|
bca718 |
#endif
|
|
|
bca718 |
Index: glibc-2.17-c758a686/include/mqueue.h
|
|
|
bca718 |
===================================================================
|
|
|
bca718 |
--- glibc-2.17-c758a686.orig/include/mqueue.h
|
|
|
bca718 |
+++ glibc-2.17-c758a686/include/mqueue.h
|
|
|
bca718 |
@@ -1,7 +1,9 @@
|
|
|
bca718 |
#include <rt/mqueue.h>
|
|
|
bca718 |
|
|
|
bca718 |
-#if IS_IN (librt)
|
|
|
bca718 |
+#ifndef _ISOMAC
|
|
|
bca718 |
+# if IS_IN (librt)
|
|
|
bca718 |
hidden_proto (mq_timedsend)
|
|
|
bca718 |
hidden_proto (mq_timedreceive)
|
|
|
bca718 |
hidden_proto (mq_setattr)
|
|
|
bca718 |
+# endif
|
|
|
bca718 |
#endif
|