diff options
author | Coren[m] <Break@Ocean> | 2013-09-17 01:15:57 +0200 |
---|---|---|
committer | Coren[m] <Break@Ocean> | 2013-09-17 01:15:57 +0200 |
commit | aa71dea96d59032cb0db4209111d434f535d8ac3 (patch) | |
tree | 82de39d9612ecc4e8cbf86dfacb7b064c8b90c94 /toxcore/Messenger.c | |
parent | 1c57a3a3de376c8e9f127c409032fd94298e5e7b (diff) | |
parent | 67da01fb0616fcdf39db8ffb26bd40c9e4bc9d83 (diff) |
Merge remote-tracking branch 'upstream/master' into MessengerLoadSave
Diffstat (limited to 'toxcore/Messenger.c')
-rw-r--r-- | toxcore/Messenger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 7ab4a92e..a27a44dc 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -1590,12 +1590,12 @@ static int messenger_load_state_callback(void *outer, uint8_t *data, uint32_t le | |||
1590 | 1590 | ||
1591 | break; | 1591 | break; |
1592 | 1592 | ||
1593 | default: | ||
1594 | #ifdef DEBUG | 1593 | #ifdef DEBUG |
1594 | default: | ||
1595 | fprintf(stderr, "Load state: contains unrecognized part (len %u, type %u)\n", | 1595 | fprintf(stderr, "Load state: contains unrecognized part (len %u, type %u)\n", |
1596 | length, type); | 1596 | length, type); |
1597 | #endif | ||
1598 | break; | 1597 | break; |
1598 | #endif | ||
1599 | } | 1599 | } |
1600 | 1600 | ||
1601 | return 0; | 1601 | return 0; |