Browse Source

compilation fixes

pull/843/head
Sergei Golubchik 17 years ago
parent
commit
9aa2ada9d0
  1. 2
      include/waiting_threads.h
  2. 2
      mysys/waiting_threads.c
  3. 2
      unittest/mysys/waiting_threads-t.c

2
include/waiting_threads.h

@ -123,7 +123,7 @@ int wt_thd_will_wait_for(WT_THD *, WT_THD *, const WT_RESOURCE_ID *);
int wt_thd_cond_timedwait(WT_THD *, pthread_mutex_t *);
void wt_thd_release(WT_THD *, const WT_RESOURCE_ID *);
#define wt_thd_release_all(THD) wt_thd_release((THD), 0)
int wt_resource_id_memcmp(const void *, const void *);
my_bool wt_resource_id_memcmp(const void *, const void *);
C_MODE_END

2
mysys/waiting_threads.c

@ -545,7 +545,7 @@ void wt_thd_destroy(WT_THD *thd)
It can be used in WT_RESOURCE_TYPE structures where bytewise
comparison of values is sufficient.
*/
int wt_resource_id_memcmp(const void *a, const void *b)
my_bool wt_resource_id_memcmp(const void *a, const void *b)
{
/* we use the fact that there's no padding in the middle of WT_RESOURCE_ID */
compile_time_assert(offsetof(WT_RESOURCE_ID, type) == sizeof(ulonglong));

2
unittest/mysys/waiting_threads-t.c

@ -262,7 +262,9 @@ void do_tests()
wt_thd_release_all(& thds[cnt].thd);
wt_thd_destroy(& thds[cnt].thd);
pthread_mutex_destroy(& thds[cnt].lock);
#ifndef DBUG_OFF
free(thds[cnt].thd.name);
#endif
}
pthread_mutex_unlock(&lock);
wt_end();

Loading…
Cancel
Save