Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

[[ LCIDLC ]] Fix issues building lcidl based externals #6071

Merged
livecodeali merged 4 commits into from
Nov 3, 2017
Merged

[[ LCIDLC ]] Fix issues building lcidl based externals #6071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88d11c1
[[ Cleanup ]] Add missing field initializer
montegoulding Oct 18, 2017
7b337e7
[[ LCIDLC ]] Fixes for building on windows
montegoulding Oct 23, 2017
cac4fed
[[ Lcidlc ]] Allocate space for null terminator
montegoulding Oct 25, 2017
cf6b6a4
[[ Bug ]] Check correct var
montegoulding Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lcidlc/src/InterfaceGenerate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "");

Expand Down
12 changes: 6 additions & 6 deletions lcidlc/src/Support.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>

#ifdef __OBJC__
#import <Foundation/Foundation.h>
Expand Down Expand Up @@ -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

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down