diff options
| author | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
|---|---|---|
| committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
| commit | f8a2a865dc32bfa626cc150a509d30d897e1181b (patch) | |
| tree | 5bb6b234149cdf2a79422815dc59a0c53cb3cb0e /testing/Messenger_test.c | |
| parent | a9a7f6a5952d0385904ec9df078ac065a3f5887f (diff) | |
| parent | c4f0650ae33e1669bfc994ef4f76c6c31e4d63c0 (diff) | |
Resolved conflicts when merging upstream
Diffstat (limited to 'testing/Messenger_test.c')
| -rw-r--r-- | testing/Messenger_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c index 7c1d64e7..905bcef4 100644 --- a/testing/Messenger_test.c +++ b/testing/Messenger_test.c | |||
| @@ -56,7 +56,7 @@ | |||
| 56 | 56 | ||
| 57 | #endif | 57 | #endif |
| 58 | 58 | ||
| 59 | void print_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata) | 59 | void print_message(Messenger *m, int friendnumber, const uint8_t *string, uint16_t length, void *userdata) |
| 60 | { | 60 | { |
| 61 | printf("Message with length %u received from %u: %s \n", length, friendnumber, string); | 61 | printf("Message with length %u received from %u: %s \n", length, friendnumber, string); |
| 62 | m_sendmessage(m, friendnumber, (uint8_t *)"Test1", 6); | 62 | m_sendmessage(m, friendnumber, (uint8_t *)"Test1", 6); |