Merge pull request #377 from sodwalt/feature

Fixed warnings when compiling nTox_win32

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[]);
         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
 
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)
     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);
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 @@
 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
\ No newline at end of file
+#endif