commit 02988ec716897ac6d501e732fc7cbef612d5fab6
author Jeff Brown <jeffbrown@google.com> Fri Apr 01 12:56:35 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 01 12:56:35 2011 -0700
tree 162b323707f309f92e4541b3f3bbbfb4e014f446
parent 38a0a853a3723833ed22f7e5d80f0e1ef78d3a54
parent 3847f62209bef63735e8f72d04af1d845f67301c

Merge "Add a little input event consistency verifier."

include/ui/egl/android_natives.h

diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h
index 972e799..0a6e4fb 100644
--- a/include/ui/egl/android_natives.h
+++ b/include/ui/egl/android_natives.h
@@ -291,6 +291,9 @@
     void* reserved_proc[2];
 };
 
+// Backwards compatibility...  please switch to ANativeWindow.
+typedef struct ANativeWindow android_native_window_t;
+
 /*
  *  native_window_set_usage(..., usage)
  *  Sets the intended usage flags for the next buffers

opengl/libs/EGL/egl.cpp

diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index a53b375..6474c87 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -120,7 +120,7 @@
 
     SortedVector<egl_object_t*> objects;
 
-    egl_display_t() : magic('_dpy'), numTotalConfigs(0), configs(0) { }
+    egl_display_t() : magic('_dpy'), numTotalConfigs(0), configs(0), refs(0) { }
     ~egl_display_t() { magic = 0; }
     inline bool isReady() const { return (refs > 0); }
     inline bool isValid() const { return magic == '_dpy'; }