diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-09-18 18:21:30 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-09-18 18:21:30 -0400 |
| commit | 0d50e4d06218f7a08aad4c8d3d348b2a81344e95 (patch) | |
| tree | 33116716bb8a8718175e64d4a43122944a8e3e13 /runtime/staprun | |
| parent | a6a2869a0f4f784bab36410722f6161eab0f4503 (diff) | |
| parent | 825ae5b246c81fae746c93324a05d207103529a9 (diff) | |
| download | systemtap-steved-0d50e4d06218f7a08aad4c8d3d348b2a81344e95.tar.gz systemtap-steved-0d50e4d06218f7a08aad4c8d3d348b2a81344e95.tar.xz systemtap-steved-0d50e4d06218f7a08aad4c8d3d348b2a81344e95.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/staprun')
| -rw-r--r-- | runtime/staprun/relay.c | 11 | ||||
| -rw-r--r-- | runtime/staprun/staprun.h | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/runtime/staprun/relay.c b/runtime/staprun/relay.c index 0c009235..59d7ac9a 100644 --- a/runtime/staprun/relay.c +++ b/runtime/staprun/relay.c @@ -22,16 +22,9 @@ static time_t *time_backlog[NR_CPUS]; static int backlog_order=0; #define BACKLOG_MASK ((1 << backlog_order) - 1) -/* - * ppoll exists in glibc >= 2.4 - */ -#if (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 4)) -#define NEED_PPOLL -#endif - #ifdef NEED_PPOLL -static int ppoll(struct pollfd *fds, nfds_t nfds, - const struct timespec *timeout, const sigset_t *sigmask) +int ppoll(struct pollfd *fds, nfds_t nfds, + const struct timespec *timeout, const sigset_t *sigmask) { sigset_t origmask; int ready; diff --git a/runtime/staprun/staprun.h b/runtime/staprun/staprun.h index 1dcfabbe..f9f01003 100644 --- a/runtime/staprun/staprun.h +++ b/runtime/staprun/staprun.h @@ -186,3 +186,13 @@ extern int out_fd[NR_CPUS]; /* relay_old uses these. Set in ctl.c */ extern unsigned subbuf_size; extern unsigned n_subbufs; + +/* + * ppoll exists in glibc >= 2.4 + */ +#if (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 4)) +#define NEED_PPOLL + +extern int ppoll(struct pollfd *fds, nfds_t nfds, + const struct timespec *timeout, const sigset_t *sigmask); +#endif |