From: Julian Seward <jseward@acm.org>
Date: Sat, 26 Apr 2003 21:04:42 +0000 (+0000)
Subject: Fix compilation on glibc-2.1.X.
X-Git-Tag: svn/VALGRIND_2_0_0~199
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac403fbc416403da23155a1130f3a4e29d882889;p=thirdparty%2Fvalgrind.git

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 ca7c9abdfb..3e17167cdb 100644
--- 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);
 }