Merge jcole@work.mysql.com:/home/bk/mysql

#ifndef pthread_size_t

#define pthread_ipaddr_type unsigned int

#define pthread_ipport_type unsigned short

#define pthread_clock_t long

#define pthread_size_t unsigned int

#define pthread_ssize_t int

#define pthread_time_t long

#define pthread_fpos_t long

#define pthread_off_t long

#define pthread_va_list void *

#endif