summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2007-11-08 15:59:45 +0200
committerPanu Matilainen <pmatilai@redhat.com>2007-11-08 15:59:45 +0200
commit7d032c35059210b81ac8054a81ea1270837fadc3 (patch)
tree028b8431345337eebfc2200be7f51c5e78d750de
parent262f2d63b1789cd832db37037e7988306db524a6 (diff)
downloadrpm-7d032c35059210b81ac8054a81ea1270837fadc3.tar.gz
rpm-7d032c35059210b81ac8054a81ea1270837fadc3.tar.bz2
rpm-7d032c35059210b81ac8054a81ea1270837fadc3.zip
Minimal protection for rpmsqElem internals
-rw-r--r--lib/psm.h1
-rw-r--r--rpmio/rpmsq.c1
-rw-r--r--rpmio/rpmsq.h3
3 files changed, 5 insertions, 0 deletions
diff --git a/lib/psm.h b/lib/psm.h
index 91a992d46..22657ab31 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -6,6 +6,7 @@
* Package state machine to handle a package from a transaction set.
*/
+#define _RPMSQ_INTERNAL
#include "rpmsq.h"
extern int _psm_debug;
diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c
index 52666a1f3..9d55f4223 100644
--- a/rpmio/rpmsq.c
+++ b/rpmio/rpmsq.c
@@ -63,6 +63,7 @@ static pthread_mutex_t rpmsigTbl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
#endif /* HAVE_PTHREAD_H */
+#define _RPMSQ_INTERNAL
#include "rpmsq.h"
#include "debug.h"
diff --git a/rpmio/rpmsq.h b/rpmio/rpmsq.h
index 0d0f4fa1b..ff009c012 100644
--- a/rpmio/rpmsq.h
+++ b/rpmio/rpmsq.h
@@ -30,6 +30,8 @@ typedef void (*rpmsqAction_t) (int signum, void * info, void * context);
extern int _rpmsq_debug;
+/* XXX make this fully opaque? */
+#if defined(_RPMSQ_INTERNAL)
/**
* SIGCHLD queue element.
*/
@@ -47,6 +49,7 @@ struct rpmsqElem {
pthread_mutex_t mutex; /*!< Signal delivery to thread condvar. */
pthread_cond_t cond;
};
+#endif /* _RPMSQ_INTERNAL */
extern rpmsq rpmsqQueue;