[[ Merge 6.7.4-rc-1 ]] Fix compilation issues

livecodesebastien · livecodesebastien · commit 3b3501a9da4d · 2015-02-23T14:35:27.000Z
diff --git a/engine/src/deploy.cpp b/engine/src/deploy.cpp
@@ -396,9 +396,9 @@ bool MCDeployWriteCapsule(const MCDeployParameters& p_params, MCDeployFileRef p_
     if (t_success)
         for(uint32_t i = 0; i < MCArrayGetCount(p_params.library) && t_success; i++)
         {
-            MCValueRef t_value;
+            MCValueRef t_val;
             /* UNCHECKED */ MCArrayFetchValueAtIndex(p_params.library, i + 1, t_val);
-            t_success = MCDeployCapsuleDefine(t_capsule, kMCCapsuleSectionTypeLibrary, (MCStringRef)t_val);
+            t_success = MCDeployCapsuleDefineString(t_capsule, kMCCapsuleSectionTypeLibrary, (MCStringRef)t_val);
         }
     
 	// Now add the externals, if any
diff --git a/engine/src/external.cpp b/engine/src/external.cpp
@@ -274,10 +274,9 @@ MCExternal *MCExternal::Load(MCStringRef p_filename)
 	{
         // AL-2015-02-10: [[ SB Inclusions ]] Load external using new module loading utility
         MCAutoPointer<char> t_filename_cstring;
-        if (!MCStringConvertToCString(p_filename, *t_filename))
-            return false;
+        if (MCStringConvertToCString(p_filename, &t_filename_cstring))
+            t_module = MCU_loadmodule(*t_filename_cstring);
 
-        t_module = MCU_loadmodule(*t_filename_cstring);
 		if (t_module == NULL)
 			t_success = false;
 	}
diff --git a/engine/src/mode_standalone.cpp b/engine/src/mode_standalone.cpp
@@ -244,7 +244,7 @@ bool MCStandaloneCapsuleCallback(void *p_self, const uint8_t *p_digest, MCCapsul
     {
         char *t_mapping;
         t_mapping = new char[p_length];
-        if (IO_read_bytes(t_mapping, p_length, p_stream) != IO_NORMAL)
+        if (IO_read(t_mapping, p_length, p_stream) != IO_NORMAL)
         {
             MCresult -> sets("failed to read library mapping");
             return false;
diff --git a/libexternal/src/external.c b/libexternal/src/external.c
@@ -666,7 +666,7 @@ void ShowImageByIdUTF8(const char *p_group, unsigned long p_id, int *r_success)
 
     // ExternalV0, interface V3 from LiveCode 6.7.4 have no UTF-8 functions
     if (s_external_interface_version < 2 ||
-            s_operations[OPEROPERATION_SHOW_IMAGE_BY_ID_UTF8] == NULL)
+            s_operations[OPERATION_SHOW_IMAGE_BY_ID_UTF8] == NULL)
 	{
 		*r_success = EXTERNAL_FAILURE;
 		return;

Original file line number	Diff line number	Diff line change
`@@ -396,9 +396,9 @@ bool MCDeployWriteCapsule(const MCDeployParameters& p_params, MCDeployFileRef p_`
`396`	`396`	`if (t_success)`
`397`	`397`	`for(uint32_t i = 0; i < MCArrayGetCount(p_params.library) && t_success; i++)`
`398`	`398`	`{`
`399`		`- MCValueRef t_value;`
	`399`	`+ MCValueRef t_val;`
`400`	`400`	`/* UNCHECKED */ MCArrayFetchValueAtIndex(p_params.library, i + 1, t_val);`
`401`		`- t_success = MCDeployCapsuleDefine(t_capsule, kMCCapsuleSectionTypeLibrary, (MCStringRef)t_val);`
	`401`	`+ t_success = MCDeployCapsuleDefineString(t_capsule, kMCCapsuleSectionTypeLibrary, (MCStringRef)t_val);`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`// Now add the externals, if any`
Original file line number	Diff line number	Diff line change
`@@ -274,10 +274,9 @@ MCExternal *MCExternal::Load(MCStringRef p_filename)`
`274`	`274`	`{`
`275`	`275`	`// AL-2015-02-10: [[ SB Inclusions ]] Load external using new module loading utility`
`276`	`276`	`MCAutoPointer<char> t_filename_cstring;`
`277`		`- if (!MCStringConvertToCString(p_filename, *t_filename))`
`278`		`- return false;`
	`277`	`+ if (MCStringConvertToCString(p_filename, &t_filename_cstring))`
	`278`	`+ t_module = MCU_loadmodule(*t_filename_cstring);`
`279`	`279`
`280`		`- t_module = MCU_loadmodule(*t_filename_cstring);`
`281`	`280`	`if (t_module == NULL)`
`282`	`281`	`t_success = false;`
`283`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ bool MCStandaloneCapsuleCallback(void p_self, const uint8_t p_digest, MCCapsul`
`244`	`244`	`{`
`245`	`245`	`char *t_mapping;`
`246`	`246`	`t_mapping = new char[p_length];`
`247`		`- if (IO_read_bytes(t_mapping, p_length, p_stream) != IO_NORMAL)`
	`247`	`+ if (IO_read(t_mapping, p_length, p_stream) != IO_NORMAL)`
`248`	`248`	`{`
`249`	`249`	`MCresult -> sets("failed to read library mapping");`
`250`	`250`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ void ShowImageByIdUTF8(const char p_group, unsigned long p_id, int r_success)`
`666`	`666`
`667`	`667`	`// ExternalV0, interface V3 from LiveCode 6.7.4 have no UTF-8 functions`
`668`	`668`	`if (s_external_interface_version < 2 \|\|`
`669`		`- s_operations[OPEROPERATION_SHOW_IMAGE_BY_ID_UTF8] == NULL)`
	`669`	`+ s_operations[OPERATION_SHOW_IMAGE_BY_ID_UTF8] == NULL)`
`670`	`670`	`{`
`671`	`671`	`*r_success = EXTERNAL_FAILURE;`
`672`	`672`	`return;`