[mojo-edk] Minor clean-up in the ports layer

mojo/edk/system/ports/event.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_EDK_SYSTEM_PORTS_EVENT_H_
 #define MOJO_EDK_SYSTEM_PORTS_EVENT_H_
 
 #include <stdint.h>
 
 #include "mojo/edk/system/ports/message.h"
 #include "mojo/edk/system/ports/name.h"
-#include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 namespace edk {
 namespace ports {
 
-// TODO: Add static assertions of alignment.
+struct PortDescriptor {
+  PortDescriptor();
+  ~PortDescriptor();
 
-struct MOJO_ALIGNAS(8) PortDescriptor {
   NodeName peer_node_name;
   PortName peer_port_name;
   NodeName referring_node_name;
   PortName referring_port_name;
   uint64_t next_sequence_num_to_send;
   uint64_t next_sequence_num_to_receive;
   uint64_t last_sequence_num_to_receive;
   bool peer_closed;
+  uint8_t padding0;
+  uint16_t padding1;
+  uint32_t padding2;
 };
 
-enum struct EventType : uint32_t {
+enum EventType : uint32_t {
   kUser,
   kPortAccepted,
   kObserveProxy,
   kObserveProxyAck,
   kObserveClosure,
 };
 
 struct EventHeader {
   EventType type;
   uint32_t padding;
@@ skipping 48 matching lines @@
 
 inline PortDescriptor* GetMutablePortDescriptors(UserEventData* event) {
   return reinterpret_cast<PortDescriptor*>(reinterpret_cast<char*>(event + 1));
 }
 
 }  // namespace ports
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_PORTS_EVENT_H_