Fix compilation on glibc-2.1.X.

MERGE TO STABLE

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

diff --git a/coregrind/vg_intercept.c b/coregrind/vg_intercept.c
index ca7c9abdfbc23bf7f67820a0bfcb4b19e37345ef..3e17167cdb6bd951a9480d4d8cc9dba273a79b11 100644 (file)
--- a/coregrind/vg_intercept.c
+++ b/coregrind/vg_intercept.c
@@ -65,7 +65,9 @@
 #include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-
+#ifdef GLIBC_2_1
+#include <sys/time.h>
+#endif
 
 /* --------------------------------------------------------------- */
 
@@ -409,7 +411,11 @@ int VGR_(msgsnd)(int msgid,
    return 0;
 }
 
+#ifdef GLIBC_2_1
+int msgsnd(int msgid,       void *msgp, size_t msgsz, int msgflg)
+#else
 int msgsnd(int msgid, const void *msgp, size_t msgsz, int msgflg)
+#endif
 {
    return VGR_(msgsnd)(msgid, msgp, msgsz, msgflg);
 }