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 49b47ec2c12989dceba0863f910d42847fbe4592..dc32f0c43ec1349767428f387f848edd3476eb4e 100644 (file)
--- 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;