X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fms_memslap.h;h=dc0844d82ff2496eb03ca86a61fea5f59d9784cd;hb=a0839196b17cc4189b1fdf375f6f7212bb262dec;hp=51023d9d2514868722b2f0c3690d7e5f6ae6bbb6;hpb=d39962cd481eb10a7d9dceb6d442af0fd49521fb;p=awesomized%2Flibmemcached

diff --git a/clients/ms_memslap.h b/clients/ms_memslap.h
index 51023d9d..dc0844d8 100644
--- a/clients/ms_memslap.h
+++ b/clients/ms_memslap.h
@@ -19,7 +19,9 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <pthread.h>
-#include <stdbool.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
 #include <math.h>
 
 #include "ms_stats.h"
@@ -90,7 +92,7 @@ typedef struct stats
 /* lock adapter */
 typedef struct sync_lock
 {
-  int count;
+  uint32_t count;
   pthread_mutex_t lock;
   pthread_cond_t cond;
 } ms_sync_lock_t;
@@ -100,6 +102,7 @@ typedef struct global
 {
   /* synchronize lock */
   ms_sync_lock_t init_lock;
+  ms_sync_lock_t warmup_lock;
   ms_sync_lock_t run_lock;
 
   /* mutex for outputing error log synchronously when memslap crashes */