Merge change 21537 into eclair

    void* reserved[4];

    void* reserved[4];

    /* reference-counting interface */

    /* reference-counting interface */

    void (*incRef)(android_native_base_t* base);

    void (*incRef)(struct android_native_base_t* base);

    void (*decRef)(android_native_base_t* base);

    void (*decRef)(struct android_native_base_t* base);

} android_native_base_t;

} android_native_base_t;

// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------

     * 

     * 

     * Returns 0 on success or -errno on error.

     * Returns 0 on success or -errno on error.

     */

     */

    int     (*setSwapInterval)(android_native_window_t* window,

    int     (*setSwapInterval)(struct android_native_window_t* window,

                int interval);

                int interval);

    /*

    /*

     * 

     * 

     * Returns 0 on success or -errno on error.

     * Returns 0 on success or -errno on error.

     */

     */

    int     (*dequeueBuffer)(android_native_window_t* window, 

    int     (*dequeueBuffer)(struct android_native_window_t* window, 

                struct android_native_buffer_t** buffer);

                struct android_native_buffer_t** buffer);

    /*

    /*

     * 

     * 

     * Returns 0 on success or -errno on error.

     * Returns 0 on success or -errno on error.

     */

     */

    int     (*lockBuffer)(android_native_window_t* window,

    int     (*lockBuffer)(struct android_native_window_t* window,

                struct android_native_buffer_t* buffer);

                struct android_native_buffer_t* buffer);

   /*

   /*

    * hook called by EGL when modifications to the render buffer are done. 

    * hook called by EGL when modifications to the render buffer are done. 

    * 

    * 

    * Returns 0 on success or -errno on error.

    * Returns 0 on success or -errno on error.

    */

    */

    int     (*queueBuffer)(android_native_window_t* window,

    int     (*queueBuffer)(struct android_native_window_t* window,

                struct android_native_buffer_t* buffer);

                struct android_native_buffer_t* buffer);

    /*

    /*

     * 

     * 

     * Returns 0 on success or -errno on error.

     * Returns 0 on success or -errno on error.

     */

     */

    int     (*query)(android_native_window_t* window,

    int     (*query)(struct android_native_window_t* window,

                int what, int* value);

                int what, int* value);

    /*

    /*

     *  

     *  

     */

     */

    int     (*perform)(android_native_window_t* window,

    int     (*perform)(struct android_native_window_t* window,

                int operation, ... );

                int operation, ... );

    void* reserved_proc[3];

    void* reserved_proc[3];