1 files changed, 5 insertions, 11 deletions
diff --git a/cmds/lshal/TableEntry.h b/cmds/lshal/TableEntry.h
index 476aa04513..0ff0c96d38 100644
--- a/cmds/lshal/TableEntry.h
+++ b/cmds/lshal/TableEntry.h
@@ -32,28 +32,22 @@ namespace android {
 namespace lshal {
 
 using android::procpartition::Partition;
-using Pids = std::vector<pid_t>;
+using Pids = std::vector<int32_t>;
 
 enum class TableColumnType : unsigned int {
-    INTERFACE_NAME = 0,
+    INTERFACE_NAME,
     TRANSPORT,
     SERVER_PID,
+    SERVER_CMD,
     SERVER_ADDR,
+    CLIENT_PIDS,
+    CLIENT_CMDS,
     ARCH,
     THREADS,
     RELEASED,
     HASH,
     VINTF,
     SERVICE_STATUS,
-    CLIENT_PIDS,
-
-    // Not a real TableColumnType. Used to determine all TableColumnTypes.
-    LAST,
-
-    // Not included in all TableColumnTypes because they replace *PID(S) when the
-    // --cmdline option is set.
-    SERVER_CMD,
-    CLIENT_CMDS,
 };
 
 enum : unsigned int {