about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-06-17 20:19:04 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-06-17 20:19:04 +0000
commitdfa2d21450f44b3ea7129858764c1508d87ae27a (patch)
treecc3fa42935be73b104d06eaa3df12b5644a8c9dc /include
parentc21d37deb268afc45fbc5bba1a97f87afd0bf656 (diff)
downloadglibc-dfa2d21450f44b3ea7129858764c1508d87ae27a.tar.gz
glibc-dfa2d21450f44b3ea7129858764c1508d87ae27a.tar.xz
glibc-dfa2d21450f44b3ea7129858764c1508d87ae27a.zip
Fix mq_receive, mq_send mq_timed* namespace (bug 18545).
mq_receive calls mq_timedreceive, and mq_send calls mq_timedsend.  But
mq_receive and mq_send were in POSIX by 1996, while mq_timed* were
added in the 2001 edition of POSIX.  This patch fixes this by making
mq_timed* into weak aliases for __mq_timed* and calling the
__mq_timed* names.

Tested for x86_64 and x86 (testsuite, and that disassembly of
installed shared libraries is unchanged by the patch).

	[BZ #18545]
	* rt/mq_timedreceive.c (mq_timedreceive): Rename to
	__mq_timedreceive and define as alias of __mq_timedreceive.  Use
	hidden_weak.
	* rt/mq_timedsend.c (mq_timedsend): Rename to __mq_timedsend and
	define as alias of __mq_timedsend.  Use hidden_weak.
	* sysdeps/unix/sysv/linux/syscalls.list (mq_timedsend): Use
	__mq_timedsend as strong name.
	(mq_timedreceive): Use __mq_timedreceive as strong name.
	* include/mqueue.h (__mq_timedsend): Declare.  Use hidden_proto.
	(__mq_timedreceive): Likewise.
	* sysdeps/unix/sysv/linux/mq_receive.c (mq_receive): Call
	__mq_timedreceive instead of mq_timedreceive.
	* sysdeps/unix/sysv/linux/mq_send.c (mq_send): Call __mq_timedsend
	instead of mq_timedsend.
	* conform/Makefile (test-xfail-UNIX98/mqueue.h/linknamespace):
	Remove variable.
Diffstat (limited to 'include')
-rw-r--r--include/mqueue.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/mqueue.h b/include/mqueue.h
index eb47b9b34e..3c66f1711e 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -3,7 +3,11 @@
 #ifndef _ISOMAC
 # if IS_IN (librt)
 hidden_proto (mq_timedsend)
+extern __typeof (mq_timedsend) __mq_timedsend __nonnull ((2, 5));
+hidden_proto (__mq_timedsend)
 hidden_proto (mq_timedreceive)
+extern __typeof (mq_timedreceive) __mq_timedreceive __nonnull ((2, 5));
+hidden_proto (__mq_timedreceive)
 hidden_proto (mq_setattr)
 # endif
 #endif