Make tox_callback_friend_name stateless.

See #27 and #40 for details.

1 files changed, 3 insertions, 2 deletions

diff --git a/toxcore/friend_connection.h b/toxcore/friend_connection.h
index 044b8d7f..ecfc55ab 100644
--- a/toxcore/friend_connection.h
+++ b/toxcore/friend_connection.h
@@ -83,7 +83,7 @@ typedef struct {
         void *status_callback_object;
         int status_callback_id;
 
-        int (*data_callback)(void *object, int id, uint8_t *data, uint16_t length);
+        int (*data_callback)(void *object, int id, uint8_t *data, uint16_t length, void *userdata);
         void *data_callback_object;
         int data_callback_id;
 
@@ -159,7 +159,8 @@ int friend_add_tcp_relay(Friend_Connections *fr_c, int friendcon_id, IP_Port ip_
  */
 int friend_connection_callbacks(Friend_Connections *fr_c, int friendcon_id, unsigned int index,
                                 int (*status_callback)(void *object, int id, uint8_t status), int (*data_callback)(void *object, int id, uint8_t *data,
-                                        uint16_t length), int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length), void *object,
+                                        uint16_t length, void *userdata), int (*lossy_data_callback)(void *object, int id, const uint8_t *data,
+                                                uint16_t length), void *object,
                                 int number);
 
 /* return the crypt_connection_id for the connection.