RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 16-Jul-2017 16:18:29 Branch: rpm-5_4 Handle: 2017071614182900 Modified files: (Branch: rpm-5_4) rpm/rpmio msqio.c Log: - handle WITH_MQ and WITH_MSQ separately. Summary: Revision Changes Path 1.1.2.26 +13 -12 rpm/rpmio/msqio.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/msqio.c ============================================================================ $ cvs diff -u -r1.1.2.25 -r1.1.2.26 msqio.c --- rpm/rpmio/msqio.c 4 Jul 2017 03:13:28 -0000 1.1.2.25 +++ rpm/rpmio/msqio.c 16 Jul 2017 14:18:29 -0000 1.1.2.26 @@ -9,20 +9,11 @@ # include <sys/ipc.h> #endif -#if defined(WITH_MQ) || defined(WITH_MSQ) -#if defined(HAVE_SYS_MSG_H) -# include <sys/msg.h> -#endif +#if defined(WITH_MQ) #if defined(HAVE_MQUEUE_H) # include <mqueue.h> #endif - -#else /* WITH_MQ || WITH_MSQ */ - -/* XXX stub in enough to use struct mq_attr */ - -typedef int mqd_t; - +#else /* WITH_MQ */ struct mq_attr { long mq_flags; /* Message queue flags. */ @@ -31,8 +22,17 @@ long mq_curmsgs; /* Number of messages currently queued. */ long __pad[4]; }; +#endif /* WITH_MQ */ -#endif /* WITH_MQ || WITH_MSQ */ +#if defined(WITH_MSQ) +#if defined(HAVE_SYS_MSG_H) +# include <sys/msg.h> +#endif + +#else /* WITH_MSQ */ +/* XXX stub in enough to use struct mq_attr */ +typedef int mqd_t; +#endif /* WITH_MSQ */ #include "rpmio_internal.h" #include <rpmlog.h> @@ -574,6 +574,7 @@ msq->oattrs.mq_curmsgs = 0; msq->qid = mq_open(msq->qname, msq->flags, msq->omode, &msq->oattrs); + /* XXX FIXME: modern glibc supplies pthread_getattr_default_np() */ Z(pthread_getattr_default_np(&msq->attr)); Z(pthread_attr_setdetachstate(&msq->attr, PTHREAD_CREATE_DETACHED)); msq->sigev.sigev_notify = SIGEV_THREAD; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
