Fixed relay_old.c by providing ppoll().

* runtime/staprun/staprun.h: Put ppoll() declaration here (so that
  relay_old.c can use it).
* runtime/staprun/relay.c (ppoll): Made ppoll() non-static so that
  relay_old.c can use it.

diff --git a/runtime/staprun/relay.c b/runtime/staprun/relay.c
index 0c0092356ee5d1ce588d44ae98e944f902186300..59d7ac9a7fb73801528dd507fe49bbfba481f247 100644 (file)
--- 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 1dcfabbe444fd9c57139bcbddc1ae865249e52c3..f9f01003fda0b8348c2fde2675bc2b7a0a757145 100644 (file)
--- 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