From 0b1118d6b9f5de948048b5ed86e639571c744a7f Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Sat, 14 Jan 2017 07:46:10 -0800
Subject: minui: Move callback functions to std::function.

Also make minor clean up to the header includes.

Test: mmma bootable/recovery system/core/healthd system/extra/slideshow
Change-Id: I3bfcf2c0e203c26a98ee08f1f8036c68356a69fd
---
 minui/resources.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'minui/resources.cpp')

diff --git a/minui/resources.cpp b/minui/resources.cpp
index e6909f269..9c69030da 100644
--- a/minui/resources.cpp
+++ b/minui/resources.cpp
@@ -14,21 +14,19 @@
  * limitations under the License.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include <fcntl.h>
+#include <linux/fb.h>
+#include <linux/kd.h>
 #include <stdio.h>
-
+#include <stdlib.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/types.h>
-
-#include <linux/fb.h>
-#include <linux/kd.h>
+#include <unistd.h>
 
 #include <vector>
+
 #include <png.h>
 
 #include "minui/minui.h"
-- 
cgit v1.2.3