commit e191b16fda2f5afea3a90653c1cd4f5a3c436e89
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 18 21:33:39 2009 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 18 21:33:39 2009 +0000
tree 4f975d2c5d02b1aa26109fb3611e9dcff76f48c2
parent 63debae4c1020fa1e0ccd92ef3cbfdc8735acf8e

update windows port

git-svn-id: http://skia.googlecode.com/svn/trunk@461 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 84ce0d2..3947bdc 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -11,7 +11,7 @@
 
 #include "SampleCode.h"
 
-SkView* create_overview(int, const SkViewFactory*);
+extern SkView* create_overview(int, const SkViewFactory[]);
 
 //#define SK_SUPPORT_GL
 
@@ -503,7 +503,7 @@
 
 static void cleanup_for_filename(SkString* name) {
     char* str = name->writable_str();
-    for (int i = 0; i < name->size(); i++) {
+    for (size_t i = 0; i < name->size(); i++) {
         switch (str[i]) {
             case ':': str[i] = '-'; break;
             case '/': str[i] = '-'; break;
@@ -741,7 +741,9 @@
 
 void application_init() {
 //    setenv("ANDROID_ROOT", "../../../data", 0);
+#ifdef SK_BUILD_FOR_MAC
     setenv("ANDROID_ROOT", "/android/device/data", 0);
+#endif
 	SkGraphics::Init();
 	SkEvent::Init();
 }