commit e6dc6084c5d7a82c7c01fc8741b25b3713609858
author Alex Sakhartchouk <alexst@google.com> Wed Jun 30 16:56:10 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 30 16:56:10 2010 -0700
tree cf45926b40423e3e5b5d1b6182932b26df242434
parent 4ab16b53f6636198280a545ee6402bde57f1f84b
parent 3659d94d345c333bf98070dbe7b6daee233225a9

Merge "Fixing freetype init/uninit code. Removing debug output from stream."

rs.spec

diff --git a/rs.spec b/rs.spec
index 0a168f4..3694b65 100644
--- a/rs.spec
+++ b/rs.spec
@@ -36,7 +36,7 @@
 ContextSetSurface {
 	param uint32_t width
 	param uint32_t height
-	param android_native_window_t *sur
+	param ANativeWindow *sur
 	}
 
 ContextDump {

rsContext.cpp

diff --git a/rsContext.cpp b/rsContext.cpp
index d8c3861..68eca44 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -461,7 +461,7 @@
     objDestroyOOBDestroy();
 }
 
-void Context::setSurface(uint32_t w, uint32_t h, android_native_window_t *sur)
+void Context::setSurface(uint32_t w, uint32_t h, ANativeWindow *sur)
 {
     rsAssert(mIsGraphicsContext);
 
@@ -853,7 +853,7 @@
     rsc->resume();
 }
 
-void rsi_ContextSetSurface(Context *rsc, uint32_t w, uint32_t h, android_native_window_t *sur)
+void rsi_ContextSetSurface(Context *rsc, uint32_t w, uint32_t h, ANativeWindow *sur)
 {
     rsc->setSurface(w, h, sur);
 }

rsContext.h

diff --git a/rsContext.h b/rsContext.h
index 1485d8a..73f478a 100644
--- a/rsContext.h
+++ b/rsContext.h
@@ -103,7 +103,7 @@
 
     void pause();
     void resume();
-    void setSurface(uint32_t w, uint32_t h, android_native_window_t *sur);
+    void setSurface(uint32_t w, uint32_t h, ANativeWindow *sur);
     void setPriority(int32_t p);
 
     void assignName(ObjectBase *obj, const char *name, uint32_t len);
@@ -250,7 +250,7 @@
 
     static void * threadProc(void *);
 
-    android_native_window_t *mWndSurface;
+    ANativeWindow *mWndSurface;
 
     Vector<ObjectBase *> mNames;