diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 76923a3..b230c7e 100644
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -164,7 +164,11 @@
                                 struct sched_param *param)
 {
    kludged("pthread_attr_getschedparam");
+#  ifdef GLIBC_2_1
+   if (param) param->sched_priority = 0; /* who knows */
+#  else
    if (param) param->__sched_priority = 0; /* who knows */
+#  endif
    return 0;
 }
 
@@ -958,6 +962,10 @@
 
 #include <sys/poll.h>
 
+#ifdef GLIBC_2_1
+typedef unsigned long int nfds_t;
+#endif
+
 int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout)
 {
    unsigned int        ms_now, ms_end;