Fix compiler warnings for external.c and external.h

livecodestephen · livecodestephen · commit 4e34e6c28fca · 2015-04-27T10:11:21.000+01:00
diff --git a/libexternal/include/revolution/external.h b/libexternal/include/revolution/external.h
@@ -519,7 +519,7 @@ extern const char *ConvertCStringFromNativeToUTF8(const char *p_native, int *r_s
 extern const char *ConvertCStringToNativeFromUTF8(const char *p_utf8, int *r_success);
 	
 #ifdef __cplusplus
-};
+}
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/libexternal/src/external.c b/libexternal/src/external.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #include <revolution/external.h>
 
@@ -92,7 +93,7 @@ enum
 	/* V2 */ SECURITY_CHECK_LIBRARY_UTF8
 };
 
-typedef char *(*ExternalOperationCallback)(const char *p_arg_1, const char *p_arg_2, const char *p_arg_3, int *r_success);
+typedef char *(*ExternalOperationCallback)(const void *p_arg_1, const void *p_arg_2, const void *p_arg_3, int *r_success);
 typedef void (*ExternalDeleteCallback)(void *p_block);
 
 typedef Bool (*ExternalSecurityHandler)(const char *p_op);
@@ -406,7 +407,7 @@ void RunloopWait(int *r_success)
 		return;
 	}
 
-	t_result = (s_operations[OPERATION_RUNLOOP_WAIT])(NULL, NULL, NULL, &r_success);
+	t_result = (s_operations[OPERATION_RUNLOOP_WAIT])(NULL, NULL, NULL, r_success);
 	if (t_result != NULL)
 		s_delete(t_result);
 }
@@ -422,7 +423,7 @@ void StackToWindowRect(unsigned int p_win_id, MCRectangle32 *x_rect, int *r_succ
 		return;
 	}
     
-	t_result = (s_operations[OPERATION_STACK_TO_WINDOW_RECT])(p_win_id, x_rect, NULL, &r_success);
+    t_result = (s_operations[OPERATION_STACK_TO_WINDOW_RECT])((const void*)(uintptr_t)p_win_id, x_rect, NULL, r_success);
 	if (t_result != NULL)
 		s_delete(t_result);
 }
@@ -437,7 +438,7 @@ void WindowToStackRect(unsigned int p_win_id, MCRectangle32 *x_rect, int *r_succ
 		return;
 	}
     
-	t_result = (s_operations[OPERATION_WINDOW_TO_STACK_RECT])(p_win_id, x_rect, NULL, &r_success);
+	t_result = (s_operations[OPERATION_WINDOW_TO_STACK_RECT])((const void*)(uintptr_t)p_win_id, x_rect, NULL, r_success);
 	if (t_result != NULL)
 		s_delete(t_result);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#include <stdlib.h>`
`2`	`2`	`#include <string.h>`
`3`	`3`	`#include <stdio.h>`
	`4`	`+#include <stdint.h>`
`4`	`5`
`5`	`6`	`#include <revolution/external.h>`
`6`	`7`
`@@ -92,7 +93,7 @@ enum`
`92`	`93`	`/* V2 */ SECURITY_CHECK_LIBRARY_UTF8`
`93`	`94`	`};`
`94`	`95`
`95`		`-typedef char (ExternalOperationCallback)(const char p_arg_1, const char p_arg_2, const char p_arg_3, int r_success);`
	`96`	`+typedef char (ExternalOperationCallback)(const void p_arg_1, const void p_arg_2, const void p_arg_3, int r_success);`
`96`	`97`	`typedef void (ExternalDeleteCallback)(void p_block);`
`97`	`98`
`98`	`99`	`typedef Bool (ExternalSecurityHandler)(const char p_op);`
`@@ -406,7 +407,7 @@ void RunloopWait(int *r_success)`
`406`	`407`	`return;`
`407`	`408`	`}`
`408`	`409`
`409`		`- t_result = (s_operations[OPERATION_RUNLOOP_WAIT])(NULL, NULL, NULL, &r_success);`
	`410`	`+ t_result = (s_operations[OPERATION_RUNLOOP_WAIT])(NULL, NULL, NULL, r_success);`
`410`	`411`	`if (t_result != NULL)`
`411`	`412`	`s_delete(t_result);`
`412`	`413`	`}`
`@@ -422,7 +423,7 @@ void StackToWindowRect(unsigned int p_win_id, MCRectangle32 x_rect, int r_succ`
`422`	`423`	`return;`
`423`	`424`	`}`
`424`	`425`
`425`		`- t_result = (s_operations[OPERATION_STACK_TO_WINDOW_RECT])(p_win_id, x_rect, NULL, &r_success);`
	`426`	`+ t_result = (s_operations[OPERATION_STACK_TO_WINDOW_RECT])((const void*)(uintptr_t)p_win_id, x_rect, NULL, r_success);`
`426`	`427`	`if (t_result != NULL)`
`427`	`428`	`s_delete(t_result);`
`428`	`429`	`}`
`@@ -437,7 +438,7 @@ void WindowToStackRect(unsigned int p_win_id, MCRectangle32 x_rect, int r_succ`
`437`	`438`	`return;`
`438`	`439`	`}`
`439`	`440`
`440`		`- t_result = (s_operations[OPERATION_WINDOW_TO_STACK_RECT])(p_win_id, x_rect, NULL, &r_success);`
	`441`	`+ t_result = (s_operations[OPERATION_WINDOW_TO_STACK_RECT])((const void*)(uintptr_t)p_win_id, x_rect, NULL, r_success);`
`441`	`442`	`if (t_result != NULL)`
`442`	`443`	`s_delete(t_result);`
`443`	`444`	`}`