Merge pull request livecode#6071 from montegoulding/lcidlc

livecodeali · web-flow · commit a615a61e0982 · 2017-11-03T14:23:21.000Z
[[ LCIDLC ]] Fix issues building lcidl based externals
diff --git a/lcidlc/src/InterfaceGenerate.cpp b/lcidlc/src/InterfaceGenerate.cpp
@@ -1709,7 +1709,7 @@ static bool InterfaceGenerateExports(InterfaceRef self, CoderRef p_coder)
 			NameGetCString(t_handler -> name),
 			NameGetCString(t_handler -> name));
 	}
-	CoderWriteLine(p_coder, "\t{ 0 }\n};");
+	CoderWriteLine(p_coder, "\t{ 0, nullptr, nullptr }\n};");
 	
 	CoderWriteLine(p_coder, "");
 	
diff --git a/lcidlc/src/Support.mm b/lcidlc/src/Support.mm
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 
 #ifdef __OBJC__
 #import <Foundation/Foundation.h>
@@ -49,10 +50,9 @@
 
 #ifdef __WINDOWS__
 #include <windows.h>
-typedef unsigned int uint32_t;
+#define strcasecmp _stricmp
 #else
 #include <pthread.h>
-#include <stdint.h>
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1147,7 +1147,7 @@ static LCError LCArrayResolvePath(LCArrayRef p_array, unsigned int p_options, co
 	t_key = (MCVariableRef)p_array;
     
     // SN-2015-01-15: [[ Bug 14057 ]] Use the UTF8 string if possible.
-    int32_t t_option;
+    uint32_t t_option;
     if (s_interface -> version < 6)
         t_option = kMCOptionAsCString;
     else
@@ -1443,7 +1443,7 @@ LCError LCArrayStoreKeyOnPath(LCArrayRef p_array, unsigned int p_options, const
     t_key = (MCVariableRef)p_array;
     
     // SN-2015-01-15: [[ Bug 14057 ]] Use the UTF8 string if possible.
-    int32_t t_option;
+    uint32_t t_option;
     if (s_interface -> version < 6)
         t_option = kMCOptionAsCString;
     else
@@ -2744,7 +2744,7 @@ void LCExceptionRaise(const char *p_format, ...)
 	va_end(args);
 	
 	free(s_error);
-	s_error = (char *)malloc(length);
+	s_error = (char *)malloc(length+1);
 	if (s_error == nil)
 		return;
 	
@@ -2864,7 +2864,7 @@ static bool default__cstring(const char *arg, char*& r_value)
 {
 	char *t_arg_copy;
 	t_arg_copy = strdup(arg);
-	if (r_value != nil)
+	if (t_arg_copy != nil)
 	{
 		r_value = t_arg_copy;
 		return true;

Original file line number	Diff line number	Diff line change
`@@ -1709,7 +1709,7 @@ static bool InterfaceGenerateExports(InterfaceRef self, CoderRef p_coder)`
`1709`	`1709`	`NameGetCString(t_handler -> name),`
`1710`	`1710`	`NameGetCString(t_handler -> name));`
`1711`	`1711`	`}`
`1712`		`- CoderWriteLine(p_coder, "\t{ 0 }\n};");`
	`1712`	`+ CoderWriteLine(p_coder, "\t{ 0, nullptr, nullptr }\n};");`
`1713`	`1713`
`1714`	`1714`	`CoderWriteLine(p_coder, "");`
`1715`	`1715`