[[ Windows Compile Issue ]] Do not include stdind.h on Windows in external.c

livecodesebastien · livecodesebastien · commit 79967956ac6e · 2015-05-01T11:00:46.000+01:00
diff --git a/libexternal/src/external.c b/libexternal/src/external.c
@@ -1,7 +1,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+
+#ifndef _WINDOWS
 #include <stdint.h>
+#endif
 
 #include <revolution/external.h>
 
@@ -919,7 +922,7 @@ const char *ConvertCStringFromNativeToUTF8(const char *p_native, int *r_success)
     if (s_external_interface_version < 4)
     {
         *r_success = EXTERNAL_FAILURE;
-        return;
+        return NULL;
     }
     
     t_result = (s_operations[OPERATION_CONVERT_FROM_NATIVE_TO_UTF8])(p_native, NULL, NULL, r_success);
@@ -934,7 +937,7 @@ const char *ConvertCStringToNativeFromUTF8(const char *p_utf8, int *r_success)
     if (s_external_interface_version < 4)
     {
         *r_success = EXTERNAL_FAILURE;
-        return;
+        return NULL;
     }
     
     t_result = (s_operations[OPERATION_CONVERT_TO_NATIVE_FROM_UTF8])(p_utf8, NULL, NULL, r_success);

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`	`1`	`#include <stdlib.h>`
`2`	`2`	`#include <string.h>`
`3`	`3`	`#include <stdio.h>`
	`4`	`+`
	`5`	`+#ifndef _WINDOWS`
`4`	`6`	`#include <stdint.h>`
	`7`	`+#endif`
`5`	`8`
`6`	`9`	`#include <revolution/external.h>`
`7`	`10`
`@@ -919,7 +922,7 @@ const char ConvertCStringFromNativeToUTF8(const char p_native, int *r_success)`
`919`	`922`	`if (s_external_interface_version < 4)`
`920`	`923`	`{`
`921`	`924`	`*r_success = EXTERNAL_FAILURE;`
`922`		`- return;`
	`925`	`+ return NULL;`
`923`	`926`	`}`
`924`	`927`
`925`	`928`	`t_result = (s_operations[OPERATION_CONVERT_FROM_NATIVE_TO_UTF8])(p_native, NULL, NULL, r_success);`
`@@ -934,7 +937,7 @@ const char ConvertCStringToNativeFromUTF8(const char p_utf8, int *r_success)`
`934`	`937`	`if (s_external_interface_version < 4)`
`935`	`938`	`{`
`936`	`939`	`*r_success = EXTERNAL_FAILURE;`
`937`		`- return;`
	`940`	`+ return NULL;`
`938`	`941`	`}`
`939`	`942`
`940`	`943`	`t_result = (s_operations[OPERATION_CONVERT_TO_NATIVE_FROM_UTF8])(p_utf8, NULL, NULL, r_success);`