diff options
author | iphydf <iphydf@users.noreply.github.com> | 2016-09-01 00:33:20 +0100 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2016-09-01 16:35:46 +0100 |
commit | 77db27331eb326615395fa59f3741424f85887bb (patch) | |
tree | 233270b558c30f9a045e30e09c2d5681c800a139 /testing | |
parent | ad135181531e567255c314593984d16cdb839eba (diff) |
Sort #includes in all source files.
Diffstat (limited to 'testing')
-rw-r--r-- | testing/DHT_test.c | 2 | ||||
-rw-r--r-- | testing/Messenger_test.c | 2 | ||||
-rw-r--r-- | testing/av_test.c | 10 | ||||
-rw-r--r-- | testing/dns3_test.c | 4 | ||||
-rw-r--r-- | testing/irc_syncbot.c | 12 | ||||
-rw-r--r-- | testing/misc_tools.c | 6 | ||||
-rw-r--r-- | testing/nTox.c | 10 | ||||
-rw-r--r-- | testing/tox_shell.c | 2 | ||||
-rw-r--r-- | testing/tox_sync.c | 4 |
9 files changed, 26 insertions, 26 deletions
diff --git a/testing/DHT_test.c b/testing/DHT_test.c index cd3ff5f7..e782d765 100644 --- a/testing/DHT_test.c +++ b/testing/DHT_test.c | |||
@@ -44,8 +44,8 @@ | |||
44 | #define c_sleep(x) Sleep(1*x) | 44 | #define c_sleep(x) Sleep(1*x) |
45 | 45 | ||
46 | #else | 46 | #else |
47 | #include <unistd.h> | ||
48 | #include <arpa/inet.h> | 47 | #include <arpa/inet.h> |
48 | #include <unistd.h> | ||
49 | #define c_sleep(x) usleep(1000*x) | 49 | #define c_sleep(x) usleep(1000*x) |
50 | 50 | ||
51 | #endif | 51 | #endif |
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c index f31052e3..790439e7 100644 --- a/testing/Messenger_test.c +++ b/testing/Messenger_test.c | |||
@@ -49,8 +49,8 @@ | |||
49 | #define c_sleep(x) Sleep(1*x) | 49 | #define c_sleep(x) Sleep(1*x) |
50 | 50 | ||
51 | #else | 51 | #else |
52 | #include <unistd.h> | ||
53 | #include <arpa/inet.h> | 52 | #include <arpa/inet.h> |
53 | #include <unistd.h> | ||
54 | #define c_sleep(x) usleep(1000*x) | 54 | #define c_sleep(x) usleep(1000*x) |
55 | #define PORT 33445 | 55 | #define PORT 33445 |
56 | 56 | ||
diff --git a/testing/av_test.c b/testing/av_test.c index c370a66f..2870e587 100644 --- a/testing/av_test.c +++ b/testing/av_test.c | |||
@@ -24,9 +24,9 @@ | |||
24 | 24 | ||
25 | 25 | ||
26 | #include "../toxav/toxav.h" | 26 | #include "../toxav/toxav.h" |
27 | #include "../toxcore/network.h" /* current_time_monotonic() */ | ||
27 | #include "../toxcore/tox.h" | 28 | #include "../toxcore/tox.h" |
28 | #include "../toxcore/util.h" | 29 | #include "../toxcore/util.h" |
29 | #include "../toxcore/network.h" /* current_time_monotonic() */ | ||
30 | 30 | ||
31 | /* Playing audio data */ | 31 | /* Playing audio data */ |
32 | #include <portaudio.h> | 32 | #include <portaudio.h> |
@@ -35,16 +35,16 @@ | |||
35 | 35 | ||
36 | /* Reading and Displaying video data */ | 36 | /* Reading and Displaying video data */ |
37 | #include <opencv/cv.h> | 37 | #include <opencv/cv.h> |
38 | #include <opencv/highgui.h> | ||
39 | #include <opencv/cvwimage.h> | 38 | #include <opencv/cvwimage.h> |
39 | #include <opencv/highgui.h> | ||
40 | 40 | ||
41 | #include <sys/stat.h> | ||
42 | #include <assert.h> | 41 | #include <assert.h> |
42 | #include <errno.h> | ||
43 | #include <stdio.h> | 43 | #include <stdio.h> |
44 | #include <stdlib.h> | 44 | #include <stdlib.h> |
45 | #include <time.h> | ||
46 | #include <string.h> | 45 | #include <string.h> |
47 | #include <errno.h> | 46 | #include <sys/stat.h> |
47 | #include <time.h> | ||
48 | #include <unistd.h> | 48 | #include <unistd.h> |
49 | 49 | ||
50 | #ifdef __APPLE__ | 50 | #ifdef __APPLE__ |
diff --git a/testing/dns3_test.c b/testing/dns3_test.c index ee719b8e..063ea8c7 100644 --- a/testing/dns3_test.c +++ b/testing/dns3_test.c | |||
@@ -1,8 +1,8 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #include "../toxdns/toxdns.h" | ||
4 | #include "../toxcore/tox.h" | ||
5 | #include "../toxcore/network.h" | 3 | #include "../toxcore/network.h" |
4 | #include "../toxcore/tox.h" | ||
5 | #include "../toxdns/toxdns.h" | ||
6 | #include "misc_tools.c" | 6 | #include "misc_tools.c" |
7 | 7 | ||
8 | #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32) | 8 | #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32) |
diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c index 01e557d5..558b3631 100644 --- a/testing/irc_syncbot.c +++ b/testing/irc_syncbot.c | |||
@@ -1,19 +1,19 @@ | |||
1 | 1 | ||
2 | #include <stdlib.h> | ||
3 | #include <stdio.h> | ||
4 | #include <stdint.h> | 2 | #include <stdint.h> |
3 | #include <stdio.h> | ||
4 | #include <stdlib.h> | ||
5 | #include <string.h> | 5 | #include <string.h> |
6 | #include <time.h> | 6 | #include <time.h> |
7 | 7 | ||
8 | 8 | ||
9 | #include <fcntl.h> | ||
10 | #include <sys/socket.h> | ||
11 | #include <netinet/in.h> | ||
12 | #include <arpa/inet.h> | 9 | #include <arpa/inet.h> |
13 | #include <errno.h> | 10 | #include <errno.h> |
11 | #include <fcntl.h> | ||
12 | #include <netdb.h> | ||
13 | #include <netinet/in.h> | ||
14 | #include <sys/socket.h> | ||
14 | #include <sys/time.h> | 15 | #include <sys/time.h> |
15 | #include <sys/types.h> | 16 | #include <sys/types.h> |
16 | #include <netdb.h> | ||
17 | #include <unistd.h> | 17 | #include <unistd.h> |
18 | 18 | ||
19 | #include <sys/ioctl.h> | 19 | #include <sys/ioctl.h> |
diff --git a/testing/misc_tools.c b/testing/misc_tools.c index ba49ebc8..de246d82 100644 --- a/testing/misc_tools.c +++ b/testing/misc_tools.c | |||
@@ -25,10 +25,10 @@ | |||
25 | #include "config.h" | 25 | #include "config.h" |
26 | #endif | 26 | #endif |
27 | 27 | ||
28 | #include <string.h> | ||
29 | #include <stdlib.h> | ||
30 | #include <stdio.h> | ||
31 | #include <stdint.h> | 28 | #include <stdint.h> |
29 | #include <stdio.h> | ||
30 | #include <stdlib.h> | ||
31 | #include <string.h> | ||
32 | 32 | ||
33 | #ifdef TOX_DEBUG | 33 | #ifdef TOX_DEBUG |
34 | #include <assert.h> | 34 | #include <assert.h> |
diff --git a/testing/nTox.c b/testing/nTox.c index 3494015c..d55d7653 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -29,21 +29,21 @@ | |||
29 | #include <winsock2.h> | 29 | #include <winsock2.h> |
30 | #include <ws2tcpip.h> | 30 | #include <ws2tcpip.h> |
31 | #else | 31 | #else |
32 | #include <sys/socket.h> | ||
33 | #include <netinet/in.h> | ||
34 | #include <arpa/inet.h> | 32 | #include <arpa/inet.h> |
35 | #include <sys/types.h> | ||
36 | #include <netdb.h> | 33 | #include <netdb.h> |
34 | #include <netinet/in.h> | ||
35 | #include <sys/socket.h> | ||
36 | #include <sys/types.h> | ||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #include <sys/select.h> | 39 | #include <sys/select.h> |
40 | 40 | ||
41 | #include "nTox.h" | ||
42 | #include "misc_tools.c" | 41 | #include "misc_tools.c" |
42 | #include "nTox.h" | ||
43 | 43 | ||
44 | #include <locale.h> | ||
44 | #include <stdio.h> | 45 | #include <stdio.h> |
45 | #include <time.h> | 46 | #include <time.h> |
46 | #include <locale.h> | ||
47 | 47 | ||
48 | #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32) | 48 | #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32) |
49 | #define c_sleep(x) Sleep(1*x) | 49 | #define c_sleep(x) Sleep(1*x) |
diff --git a/testing/tox_shell.c b/testing/tox_shell.c index f6dae7b9..77047a44 100644 --- a/testing/tox_shell.c +++ b/testing/tox_shell.c | |||
@@ -40,8 +40,8 @@ | |||
40 | #else | 40 | #else |
41 | #include <pty.h> | 41 | #include <pty.h> |
42 | #endif | 42 | #endif |
43 | #include <unistd.h> | ||
44 | #include <fcntl.h> | 43 | #include <fcntl.h> |
44 | #include <unistd.h> | ||
45 | 45 | ||
46 | #define c_sleep(x) usleep(1000*x) | 46 | #define c_sleep(x) usleep(1000*x) |
47 | 47 | ||
diff --git a/testing/tox_sync.c b/testing/tox_sync.c index c80db339..8fa11625 100644 --- a/testing/tox_sync.c +++ b/testing/tox_sync.c | |||
@@ -38,10 +38,10 @@ | |||
38 | #include <unistd.h> | 38 | #include <unistd.h> |
39 | #define c_sleep(x) usleep(1000*x) | 39 | #define c_sleep(x) usleep(1000*x) |
40 | 40 | ||
41 | #include <arpa/inet.h> | ||
41 | #include <dirent.h> | 42 | #include <dirent.h> |
42 | #include <stdio.h> | ||
43 | #include <netinet/in.h> | 43 | #include <netinet/in.h> |
44 | #include <arpa/inet.h> | 44 | #include <stdio.h> |
45 | 45 | ||
46 | #define NUM_FILE_SENDERS 256 | 46 | #define NUM_FILE_SENDERS 256 |
47 | typedef struct { | 47 | typedef struct { |