Merge from trunk.

1 files changed, 11 insertions, 6 deletions

diff --git a/librt/mq_receive.c b/librt/mq_receive.c
index 4dd81f5e7..25e3bd25b 100644
--- a/librt/mq_receive.c
+++ b/librt/mq_receive.c
@@ -9,28 +9,33 @@
 #include <mqueue.h>
 
 #ifdef __NR_mq_timedreceive
-
 #define __NR___syscall_mq_timedreceive __NR_mq_timedreceive
 static inline _syscall5(int, __syscall_mq_timedreceive, int, mqdes,
 	char *, msg_ptr, size_t, msg_len, unsigned int *, msg_prio,
 	const void *, abs_timeout);
+#endif
 
 /*
  * Receive the oldest from highest priority messages.
  * Stop waiting if abs_timeout expires.
  */
-ssize_t mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
+attribute_hidden
+ssize_t __mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
 			unsigned int *msg_prio,
 			const struct timespec *abs_timeout)
 {
-    return __syscall_mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, abs_timeout);
+#ifdef __NR_mq_timedreceive
+	return __syscall_mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, abs_timeout);
+#else
+	errno = ENOSYS;
+	return -1;
+#endif
 }
+strong_alias(__mq_timedreceive,mq_timedreceive)
 
 /* Receive the oldest from highest priority messages */
 ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
 			unsigned int *msg_prio)
 {
-    return mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, NULL);
+	return __mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, NULL);
 }
-
-#endif