diff options
author | irungentoo <irungentoo@gmail.com> | 2014-11-29 16:09:24 -0500 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-11-29 16:09:24 -0500 |
commit | 8deb032b2d9a77465a3c2b65a409787098e387cd (patch) | |
tree | 785fc1b1b975b712bb9a375af386f4de18f89663 /toxcore/util.h | |
parent | eafe0e6b0b83b4db3d79a9416d8aa33318fb12a7 (diff) | |
parent | e62ded3a6dfc1203418e3d7a2c936794c4c9ec1c (diff) |
Merge branch 'mutex-1' of https://github.com/mannol/toxcore
Diffstat (limited to 'toxcore/util.h')
-rw-r--r-- | toxcore/util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/toxcore/util.h b/toxcore/util.h index 007db079..7cd6bb8b 100644 --- a/toxcore/util.h +++ b/toxcore/util.h | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | #include <stdbool.h> | 28 | #include <stdbool.h> |
29 | #include <stdint.h> | 29 | #include <stdint.h> |
30 | #include <pthread.h> | ||
30 | 31 | ||
31 | #define MIN(a,b) (((a)<(b))?(a):(b)) | 32 | #define MIN(a,b) (((a)<(b))?(a):(b)) |
32 | 33 | ||
@@ -52,4 +53,6 @@ typedef int (*load_state_callback_func)(void *outer, const uint8_t *data, uint32 | |||
52 | int load_state(load_state_callback_func load_state_callback, void *outer, | 53 | int load_state(load_state_callback_func load_state_callback, void *outer, |
53 | const uint8_t *data, uint32_t length, uint16_t cookie_inner); | 54 | const uint8_t *data, uint32_t length, uint16_t cookie_inner); |
54 | 55 | ||
56 | int create_recursive_mutex(pthread_mutex_t *mutex); | ||
57 | |||
55 | #endif /* __UTIL_H__ */ | 58 | #endif /* __UTIL_H__ */ |