From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Sat, 28 Feb 2004 23:32:11 +0000 (+0000)
Subject: Adjust vg_pthread_cond_t so it works with an older glibc.
X-Git-Tag: svn/VALGRIND_2_1_1~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f71b28677f2d1ab8f9213cb06e9cd4fb22dbfab;p=thirdparty%2Fvalgrind.git

Adjust vg_pthread_cond_t so it works with an older glibc.


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

diff --git a/coregrind/vg_include.h b/coregrind/vg_include.h
index 49b47ec2c1..dc32f0c43e 100644
--- a/coregrind/vg_include.h
+++ b/coregrind/vg_include.h
@@ -670,11 +670,16 @@ typedef struct
 typedef struct
 {
   struct _vg_pthread_fastlock __vg_c_lock; /* Protect against concurrent access */
-  /*_pthread_descr*/ void* __vg_c_waiting;        /* Threads waiting on this condition */
+  /*_pthread_descr*/ void* __vg_c_waiting; /* Threads waiting on this condition */
+
+  // Nb: the following padding removed because it was missing from an
+  // earlier glibc, so the size test in the CONVERT macro was failing.
+  // --njn
+
   // Padding ensures the size is 48 bytes
-  char __vg_padding[48 - sizeof(struct _vg_pthread_fastlock)
+  /*char __vg_padding[48 - sizeof(struct _vg_pthread_fastlock)
          - sizeof(void*) - sizeof(long long)];
-  long long __vg_align;
+  long long __vg_align;*/
 } vg_pthread_cond_t;