diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-09-17 20:06:33 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-09-17 20:06:33 -0400 |
| commit | 7c5b98397a85394add318cf897eb5b78703e55ea (patch) | |
| tree | 3a30952c38c4a52e726467723b59c58c681a7d2f /toxcore/util.h | |
| parent | 9ce1828facc5e344d9de7bc6900bd378de99a425 (diff) | |
| parent | 5a83c1296cee5b0bfaae564896f56d78ae265fbc (diff) | |
Merge branch 'group-chat'
Diffstat (limited to 'toxcore/util.h')
| -rw-r--r-- | toxcore/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxcore/util.h b/toxcore/util.h index 6937f7d4..9e4ac79a 100644 --- a/toxcore/util.h +++ b/toxcore/util.h | |||
| @@ -18,7 +18,7 @@ void id_cpy(uint8_t *dest, uint8_t *src); | |||
| 18 | 18 | ||
| 19 | typedef int (*load_state_callback_func)(void *outer, uint8_t *data, uint32_t len, uint16_t type); | 19 | typedef int (*load_state_callback_func)(void *outer, uint8_t *data, uint32_t len, uint16_t type); |
| 20 | int load_state(load_state_callback_func load_state_callback, void *outer, | 20 | int load_state(load_state_callback_func load_state_callback, void *outer, |
| 21 | uint8_t *data, uint32_t length, uint16_t cookie_inner); | 21 | uint8_t *data, uint32_t length, uint16_t cookie_inner); |
| 22 | 22 | ||
| 23 | #undef LOGGING | 23 | #undef LOGGING |
| 24 | /* #define LOGGING */ | 24 | /* #define LOGGING */ |