commit 07cfb8fe799901948afd6af05ef4674173713bcb
author Elliott Hughes <enh@google.com> Fri Apr 10 13:12:05 2015 -0700
committer Elliott Hughes <enh@google.com> Fri Apr 10 13:42:55 2015 -0700
tree dbb3c6ea45cb910397cec50054460d46c99b454f
parent 5d1630a926a02ca13a66eb1e385eabba16b04cfc

Switch minui over to C++.

Change-Id: I59e08a304ae514a3fdb6fab58721f11670bc1b01

minui/events.cpp

diff --git a/minui/events.cpp b/minui/events.cpp
index daa10c6..2d47a58 100644
--- a/minui/events.cpp
+++ b/minui/events.cpp
@@ -39,10 +39,10 @@
 };
 
 static int g_epoll_fd;
-static struct epoll_event polledevents[MAX_DEVICES + MAX_MISC_FDS];
+static epoll_event polledevents[MAX_DEVICES + MAX_MISC_FDS];
 static int npolledevents;
 
-static struct fd_info ev_fdinfo[MAX_DEVICES + MAX_MISC_FDS];
+static fd_info ev_fdinfo[MAX_DEVICES + MAX_MISC_FDS];
 
 static unsigned ev_count = 0;
 static unsigned ev_dev_count = 0;
@@ -62,7 +62,7 @@
 
     DIR* dir = opendir("/dev/input");
     if (dir != NULL) {
-        struct dirent* de;
+        dirent* de;
         while ((de = readdir(dir))) {
             unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)];
 
@@ -83,7 +83,7 @@
                 continue;
             }
 
-            struct epoll_event ev;
+            epoll_event ev;
             ev.events = EPOLLIN | EPOLLWAKEUP;
             ev.data.ptr = &ev_fdinfo[ev_count];
             if (epoll_ctl(g_epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) {
@@ -121,7 +121,7 @@
         return -1;
     }
 
-    struct epoll_event ev;
+    epoll_event ev;
     ev.events = EPOLLIN | EPOLLWAKEUP;
     ev.data.ptr = (void *)&ev_fdinfo[ev_count];
     int ret = epoll_ctl(g_epoll_fd, EPOLL_CTL_ADD, fd, &ev);
@@ -163,7 +163,7 @@
     }
 }
 
-int ev_get_input(int fd, uint32_t epevents, struct input_event* ev) {
+int ev_get_input(int fd, uint32_t epevents, input_event* ev) {
     if (epevents & EPOLLIN) {
         ssize_t r = read(fd, ev, sizeof(*ev));
         if (r == sizeof(*ev)) {