diff options
| author | Coren[m] <Break@Ocean> | 2013-09-11 00:16:15 +0200 |
|---|---|---|
| committer | Coren[m] <Break@Ocean> | 2013-09-11 00:16:15 +0200 |
| commit | 0139f2838f158fd485733275d721a080a29551ae (patch) | |
| tree | 721a402ad418482255ac644de0e03ce75f5c7a2b /auto_tests/friends_test.c | |
| parent | 4cf0d857bcf87ba271178e7b1734958fb93b018a (diff) | |
| parent | 55499933be7857642d970d32f359e765ff4a2cab (diff) | |
Merge remote-tracking branch 'upstream/master' into Integration
Diffstat (limited to 'auto_tests/friends_test.c')
| -rw-r--r-- | auto_tests/friends_test.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/auto_tests/friends_test.c b/auto_tests/friends_test.c index 0426c18d..8a22aa87 100644 --- a/auto_tests/friends_test.c +++ b/auto_tests/friends_test.c | |||
| @@ -18,6 +18,10 @@ | |||
| 18 | * times. This is used both to ensure that we don't loop forever on a broken build, | 18 | * times. This is used both to ensure that we don't loop forever on a broken build, |
| 19 | * and that we don't get too slow with messaging. The current time is 15 seconds. */ | 19 | * and that we don't get too slow with messaging. The current time is 15 seconds. */ |
| 20 | 20 | ||
| 21 | #ifdef HAVE_CONFIG_H | ||
| 22 | #include "config.h" | ||
| 23 | #endif | ||
| 24 | |||
| 21 | #include "../toxcore/friend_requests.h" | 25 | #include "../toxcore/friend_requests.h" |
| 22 | #include "../toxcore/Messenger.h" | 26 | #include "../toxcore/Messenger.h" |
| 23 | #include <assert.h> | 27 | #include <assert.h> |