From: Julian Seward <jseward@acm.org>
Date: Wed, 24 Apr 2002 02:20:20 +0000 (+0000)
Subject: More glibc-2.1.X compiler fixes (Lionel Ulmer).
X-Git-Tag: svn/VALGRIND_1_0_3~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26934d5615432278d5c6915bf9adbaa7c4dd2261;p=thirdparty%2Fvalgrind.git

More glibc-2.1.X compiler fixes (Lionel Ulmer).


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@123
---

diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index 76923a3c77..b230c7e5a3 100644
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -164,7 +164,11 @@ int  pthread_attr_getschedparam(const  pthread_attr_t  *attr,
                                 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 @@ int select ( int n,
 
 #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;
diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 76923a3c77..b230c7e5a3 100644
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -164,7 +164,11 @@ int  pthread_attr_getschedparam(const  pthread_attr_t  *attr,
                                 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 @@ int select ( int n,
 
 #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;
diff --git a/vg_libpthread.c b/vg_libpthread.c
index 76923a3c77..b230c7e5a3 100644
--- a/vg_libpthread.c
+++ b/vg_libpthread.c
@@ -164,7 +164,11 @@ int  pthread_attr_getschedparam(const  pthread_attr_t  *attr,
                                 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 @@ int select ( int n,
 
 #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;