bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix various Mac compile errors.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@115 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2010-10-10 00:16:24 +00:00
parent 4474199dba
commit 383168173a
14 changed files with 108 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libcef/stream_impl.cc
View File

@@ -5,6 +5,7 @@
#include "stream_impl.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
// Static functions
@@ -13,7 +14,11 @@ CefRefPtr<CefStreamReader> CefStreamReader::CreateForFile(
const std::wstring& fileName)
{
CefRefPtr<CefStreamReader> reader;
#if defined(OS_WIN)
FILE *f = _wfopen(fileName.c_str(), L"rb");
#else
FILE *f = fopen(WideToUTF8(fileName).c_str(), "rb");
#endif
if(f)
reader = new CefFileReader(f, true);
return reader;
@@ -45,7 +50,11 @@ CefRefPtr<CefStreamWriter> CefStreamWriter::CreateForFile(
{
DCHECK(!fileName.empty());
CefRefPtr<CefStreamWriter> writer;
#if defined(OS_WIN)
FILE* file = _wfopen(fileName.c_str(), L"wb");
#else
FILE* file = fopen(WideToUTF8(fileName).c_str(), "wb");
#endif
if(file)
writer = new CefFileWriter(file, true);
return writer;
@@ -65,7 +74,7 @@ CefRefPtr<CefStreamWriter> CefStreamWriter::CreateForHandler(
// CefFileReader
CefFileReader::CefFileReader(FILE* file, bool close)
: file_(file), close_(close)
: close_(close), file_(file)
{
}
@@ -255,7 +264,7 @@ void CefBytesReader::SetData(void* data, long datasize, bool copy)
// CefBytesWriter
CefBytesWriter::CefBytesWriter(size_t grow)
: grow_(grow), offset_(0), datasize_(grow)
: grow_(grow), datasize_(grow), offset_(0)
{
DCHECK(grow > 0);
data_ = malloc(grow);