OS X Atlas build fix. Fix wcsdup emulation. Remove seemingly unneeded compile flag (closes #424).
This was SVN commit r7513.
This commit is contained in:
parent
4981af4a57
commit
4ea28cf809
@ -149,11 +149,6 @@ extern_lib_defs = {
|
|||||||
tinsert(package.config["Release"].links, "libxml2")
|
tinsert(package.config["Release"].links, "libxml2")
|
||||||
else
|
else
|
||||||
pkgconfig("libxml-2.0")
|
pkgconfig("libxml-2.0")
|
||||||
-- libxml2 needs _REENTRANT or __MT__ for thread support;
|
|
||||||
-- OS X doesn't get either set by default, so do it manually
|
|
||||||
if OS == "macosx" then
|
|
||||||
tinsert(package.defines, "_REENTRANT")
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
@ -102,7 +102,7 @@ wchar_t* wcsdup(const wchar_t* str)
|
|||||||
wchar_t* dst = (wchar_t*)malloc((num_chars+1)*sizeof(wchar_t)); // note: wcsdup is required to use malloc
|
wchar_t* dst = (wchar_t*)malloc((num_chars+1)*sizeof(wchar_t)); // note: wcsdup is required to use malloc
|
||||||
if(!dst)
|
if(!dst)
|
||||||
return 0;
|
return 0;
|
||||||
wcscpy_s(dst, num_chars, str);
|
wcscpy_s(dst, num_chars+1, str);
|
||||||
return dst;
|
return dst;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -104,4 +104,12 @@ public:
|
|||||||
{
|
{
|
||||||
do_fpclassify<double>();
|
do_fpclassify<double>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void test_wcsdup()
|
||||||
|
{
|
||||||
|
const wchar_t* a = L"test";
|
||||||
|
wchar_t* t = wcsdup(a);
|
||||||
|
TS_ASSERT_WSTR_EQUALS(t, a);
|
||||||
|
free(t);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
@ -248,6 +248,7 @@ public:
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if wxUSE_DEBUGREPORT
|
||||||
virtual void OnFatalException()
|
virtual void OnFatalException()
|
||||||
{
|
{
|
||||||
wxDebugReport report;
|
wxDebugReport report;
|
||||||
@ -262,6 +263,7 @@ public:
|
|||||||
OpenDirectory(dir);
|
OpenDirectory(dir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif // wxUSE_DEBUGREPORT
|
||||||
|
|
||||||
/* Disabled (and should be removed if it turns out to be unnecessary)
|
/* Disabled (and should be removed if it turns out to be unnecessary)
|
||||||
- see MessagePasserImpl.cpp for information
|
- see MessagePasserImpl.cpp for information
|
||||||
|
Loading…
Reference in New Issue
Block a user