Initial GYP file for skia / gr. Builds SampleApp on Mac, Windows, Linux.
Review URL: http://codereview.appspot.com/4282056/
git-svn-id: http://skia.googlecode.com/svn/trunk@955 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/utils/SkOSFile.cpp b/src/utils/SkOSFile.cpp
index 982bc08..c1b6943 100644
--- a/src/utils/SkOSFile.cpp
+++ b/src/utils/SkOSFile.cpp
@@ -31,18 +31,19 @@
size_t len = strlen(src);
fStr = (uint16_t*)sk_malloc_throw((len + 1) * sizeof(uint16_t));
- for (size_t i = 0; i < len; i++)
+ size_t i;
+ for (i = 0; i < len; i++)
fStr[i] = src[i];
fStr[i] = 0;
}
////////////////////////////////////////////////////////////////////////////
-SkOSFile::Iter::Iter() : fHandle(0), fPath16(nil)
+SkOSFile::Iter::Iter() : fHandle(0), fPath16(NULL)
{
}
-SkOSFile::Iter::Iter(const char path[], const char suffix[]) : fHandle(0), fPath16(nil)
+SkOSFile::Iter::Iter(const char path[], const char suffix[]) : fHandle(0), fPath16(NULL)
{
this->reset(path, suffix);
}
@@ -61,7 +62,7 @@
::FindClose(fHandle);
fHandle = 0;
}
- if (path == nil)
+ if (NULL == path)
path = "";
sk_free(fPath16);
@@ -78,7 +79,7 @@
{
WIN32_FIND_DATAW data;
- if (dataPtr == nil)
+ if (NULL == dataPtr)
{
if (::FindNextFileW(handle, &data))
dataPtr = &data;
@@ -90,7 +91,7 @@
{
if (getDir)
{
- if ((dataPtr->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && !is_magic_dir(dataPtr->cFileName))
+ if ((dataPtr->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && !is_magic_dir((uint16_t*)dataPtr->cFileName))
break;
}
else
@@ -103,21 +104,21 @@
}
// if we get here, we've found a file/dir
if (name)
- name->setUTF16(dataPtr->cFileName);
+ name->setUTF16((uint16_t*)dataPtr->cFileName);
return true;
}
bool SkOSFile::Iter::next(SkString* name, bool getDir)
{
WIN32_FIND_DATAW data;
- WIN32_FIND_DATAW* dataPtr = nil;
+ WIN32_FIND_DATAW* dataPtr = NULL;
if (fHandle == 0) // our first time
{
- if (fPath16 == nil || *fPath16 == 0) // check for no path
+ if (fPath16 == NULL || *fPath16 == 0) // check for no path
return false;
- fHandle = ::FindFirstFileW(fPath16, &data);
+ fHandle = ::FindFirstFileW((LPCWSTR)fPath16, &data);
if (fHandle != 0 && fHandle != (HANDLE)~0)
dataPtr = &data;
}