StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core

Browse Source
This commit is contained in:
irungentoo 2013-08-07 18:23:26 -04:00
commit 81fccf68d6
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/misc_tools.h
View File

@ -51,6 +51,7 @@ unsigned char * hex_string_to_bin(char hex_string[]);
DEBUG_PRINT(__VA_ARGS__, ' '); \
} while (0)
#undef ERROR
#define ERROR(exit_status, ...) do { \
fprintf(stderr, "error in "); \
DEBUG_PRINT(__VA_ARGS__, ' '); \
@ -58,6 +59,7 @@ unsigned char * hex_string_to_bin(char hex_string[]);
} while (0)
#else
#define WARNING(...)
#undef ERROR
#define ERROR(...)
#endif // DEBUG

2
testing/nTox_win32.c
View File

@ -86,7 +86,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
printf(msg);
}
void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
void print_statuschange(int friendnumber,USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
{
char name[MAX_NAME_LENGTH];
getname(friendnumber, (uint8_t*)name);

4
testing/nTox_win32.h
View File

@ -32,7 +32,7 @@
void do_header();
void print_message(int friendnumber, uint8_t * string, uint16_t length);
void print_nickchange(int friendnumber, uint8_t *string, uint16_t length);
void print_statuschange(int friendnumber, uint8_t *string, uint16_t length);
void print_statuschange(int friendnumber,USERSTATUS_KIND kind, uint8_t *string, uint16_t length);
void load_key();
void add_friend();
void list_friends();
@ -44,4 +44,4 @@ void accept_friend_request();
void line_eval(char* line);
void get_input();
#endif
#endif