From c3e07b73d3cd824ffc5a5ea681cde0c7c8c7732e Mon Sep 17 00:00:00 2001 From: irungentoo Date: Fri, 13 Mar 2015 15:38:44 -0400 Subject: [PATCH] Remove TOX_FILE_KIND typedef. --- testing/nTox.c | 4 ++-- testing/tox_sync.c | 4 ++-- toxcore/tox.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/nTox.c b/testing/nTox.c index e566c79f..df76cdc5 100644 --- a/testing/nTox.c +++ b/testing/nTox.c @@ -1127,8 +1127,8 @@ void print_groupnamelistchange(Tox *m, int groupnumber, int peernumber, uint8_t print_groupchatpeers(m, groupnumber); } } -void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_KIND type, - uint64_t file_size, const uint8_t *filename, size_t filename_length, void *user_data) +void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number, uint32_t type, uint64_t file_size, + const uint8_t *filename, size_t filename_length, void *user_data) { if (type != TOX_FILE_KIND_DATA) { new_lines("Refused invalid file type."); diff --git a/testing/tox_sync.c b/testing/tox_sync.c index 78c31244..603c6f22 100644 --- a/testing/tox_sync.c +++ b/testing/tox_sync.c @@ -124,8 +124,8 @@ int not_sending() static char path[1024]; -void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_KIND type, - uint64_t file_size, const uint8_t *filename, size_t filename_length, void *user_data) +void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number, uint32_t type, uint64_t file_size, + const uint8_t *filename, size_t filename_length, void *user_data) { if (type != TOX_FILE_KIND_DATA) { printf("Refused invalid file type."); diff --git a/toxcore/tox.h b/toxcore/tox.h index 993a1dad..82552eea 100644 --- a/toxcore/tox.h +++ b/toxcore/tox.h @@ -1389,7 +1389,7 @@ void tox_callback_friend_action(Tox *tox, tox_friend_action_cb *function, void * ******************************************************************************/ -typedef enum TOX_FILE_KIND { +enum TOX_FILE_KIND { /** * Arbitrary file data. Clients can choose to handle it based on the file name * or magic or any other way they choose. @@ -1412,7 +1412,7 @@ typedef enum TOX_FILE_KIND { * transfer if it matches. */ TOX_FILE_KIND_AVATAR -} TOX_FILE_KIND; +}; /**