diff options
Diffstat (limited to 'testing')
-rw-r--r-- | testing/misc_tools.h | 2 | ||||
-rw-r--r-- | testing/nTox_win32.c | 2 | ||||
-rw-r--r-- | testing/nTox_win32.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/testing/misc_tools.h b/testing/misc_tools.h index eb09693e..1abdb809 100644 --- a/testing/misc_tools.h +++ b/testing/misc_tools.h | |||
@@ -51,6 +51,7 @@ unsigned char * hex_string_to_bin(char hex_string[]); | |||
51 | DEBUG_PRINT(__VA_ARGS__, ' '); \ | 51 | DEBUG_PRINT(__VA_ARGS__, ' '); \ |
52 | } while (0) | 52 | } while (0) |
53 | 53 | ||
54 | #undef ERROR | ||
54 | #define ERROR(exit_status, ...) do { \ | 55 | #define ERROR(exit_status, ...) do { \ |
55 | fprintf(stderr, "error in "); \ | 56 | fprintf(stderr, "error in "); \ |
56 | DEBUG_PRINT(__VA_ARGS__, ' '); \ | 57 | DEBUG_PRINT(__VA_ARGS__, ' '); \ |
@@ -58,6 +59,7 @@ unsigned char * hex_string_to_bin(char hex_string[]); | |||
58 | } while (0) | 59 | } while (0) |
59 | #else | 60 | #else |
60 | #define WARNING(...) | 61 | #define WARNING(...) |
62 | #undef ERROR | ||
61 | #define ERROR(...) | 63 | #define ERROR(...) |
62 | #endif // DEBUG | 64 | #endif // DEBUG |
63 | 65 | ||
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c index 007305ad..e4489f13 100644 --- a/testing/nTox_win32.c +++ b/testing/nTox_win32.c | |||
@@ -86,7 +86,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) | |||
86 | printf(msg); | 86 | printf(msg); |
87 | } | 87 | } |
88 | 88 | ||
89 | void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) | 89 | void print_statuschange(int friendnumber,USERSTATUS_KIND kind, uint8_t *string, uint16_t length) |
90 | { | 90 | { |
91 | char name[MAX_NAME_LENGTH]; | 91 | char name[MAX_NAME_LENGTH]; |
92 | getname(friendnumber, (uint8_t*)name); | 92 | getname(friendnumber, (uint8_t*)name); |
diff --git a/testing/nTox_win32.h b/testing/nTox_win32.h index 271403b8..36d5df1f 100644 --- a/testing/nTox_win32.h +++ b/testing/nTox_win32.h | |||
@@ -32,7 +32,7 @@ | |||
32 | void do_header(); | 32 | void do_header(); |
33 | void print_message(int friendnumber, uint8_t * string, uint16_t length); | 33 | void print_message(int friendnumber, uint8_t * string, uint16_t length); |
34 | void print_nickchange(int friendnumber, uint8_t *string, uint16_t length); | 34 | void print_nickchange(int friendnumber, uint8_t *string, uint16_t length); |
35 | void print_statuschange(int friendnumber, uint8_t *string, uint16_t length); | 35 | void print_statuschange(int friendnumber,USERSTATUS_KIND kind, uint8_t *string, uint16_t length); |
36 | void load_key(); | 36 | void load_key(); |
37 | void add_friend(); | 37 | void add_friend(); |
38 | void list_friends(); | 38 | void list_friends(); |
@@ -44,4 +44,4 @@ void accept_friend_request(); | |||
44 | void line_eval(char* line); | 44 | void line_eval(char* line); |
45 | void get_input(); | 45 | void get_input(); |
46 | 46 | ||
47 | #endif \ No newline at end of file | 47 | #endif |