← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/my_pthread.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/my_pthread.h
15
15
 
16
16
/* Defines to make different thread packages compatible */
17
17
 
18
 
#ifndef MYSYS_MY_PTHREAD_H
19
 
#define MYSYS_MY_PTHREAD_H
 
18
#ifndef DRIZZLED_INTERNAL_MY_PTHREAD_H
 
19
#define DRIZZLED_INTERNAL_MY_PTHREAD_H
20
20
 
21
21
#include <stdint.h>
22
22
#include <unistd.h>
156
156
#define ESRCH 1
157
157
#endif
158
158
 
159
 
typedef uint64_t my_thread_id;
160
 
 
161
159
extern bool my_thread_global_init(void);
162
160
extern void my_thread_global_end(void);
163
161
extern bool my_thread_init(void);
179
177
  pthread_mutex_t * volatile current_mutex;
180
178
  pthread_cond_t * volatile current_cond;
181
179
  pthread_t pthread_self;
182
 
  my_thread_id id;
 
180
  uint64_t id;
183
181
  int volatile abort;
184
182
  bool init;
185
183
  struct st_my_thread_var *next,**prev;
245
243
#ifdef  __cplusplus
246
244
}
247
245
#endif
248
 
#endif /* MYSYS_MY_PTHREAD_H */
 
246
#endif /* DRIZZLED_INTERNAL_MY_PTHREAD_H */