mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-14 00:14:18 +00:00
Fixed a couple of linux file issues. Removed operator& overloads from a couple of places where they shouldn't have been done. Fixed a few minor win32 compile issues. Improved some internal COM object wrappers.
This commit is contained in:
parent
5c49cdba8a
commit
6277552ef5
23 changed files with 317 additions and 332 deletions
|
|
@ -107,16 +107,16 @@ bool File::isHidden() const
|
|||
}
|
||||
|
||||
//==============================================================================
|
||||
static const File juce_readlink (const char* const utf8, const File& defaultFile)
|
||||
static const File juce_readlink (const String& file, const File& defaultFile)
|
||||
{
|
||||
const int size = 8192;
|
||||
HeapBlock<char> buffer;
|
||||
buffer.malloc (size + 4);
|
||||
|
||||
const size_t numBytes = readlink (utf8, buffer, size);
|
||||
const size_t numBytes = readlink (file.toUTF8(), buffer, size);
|
||||
|
||||
if (numBytes > 0 && numBytes <= size)
|
||||
return File (String::fromUTF8 (buffer, (int) numBytes));
|
||||
return File (file).getSiblingFile (String::fromUTF8 (buffer, (int) numBytes));
|
||||
|
||||
return defaultFile;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue