More mac fixups.

src/alloy/runtime/entry_table.cc

@@ -18,9 +18,8 @@ EntryTable::EntryTable() = default;
 
 EntryTable::~EntryTable() {
   std::lock_guard<std::mutex> guard(lock_);
-  auto& it = map_.begin();
-  for (; it != map_.end(); ++it) {
-    Entry* entry = it->second;
+  for (auto it : map_) {
+    Entry* entry = it.second;
     delete entry;
   }
 }

src/alloy/runtime/entry_table.h

@@ -12,6 +12,7 @@
 
 #include <mutex>
 #include <unordered_map>
+#include <vector>
 
 #include <alloy/core.h>
 

src/alloy/runtime/function.cc

@@ -17,8 +17,7 @@ namespace alloy {
 namespace runtime {
 
 Function::Function(FunctionInfo* symbol_info)
-    : address_(symbol_info->address()),
-      symbol_info_(symbol_info) {}
+    : address_(symbol_info->address()), symbol_info_(symbol_info) {}
 
 Function::~Function() = default;
 
@@ -81,7 +80,7 @@ int Function::Call(ThreadState* thread_state, uint64_t return_address) {
               symbol_info_->extern_arg1());
     } else {
       XELOGW("undefined extern call to %.8llX %s", symbol_info_->address(),
-             symbol_info_->name());
+             symbol_info_->name().c_str());
       result = 1;
     }
   } else {

src/alloy/runtime/thread_state.h

@@ -10,6 +10,8 @@
 #ifndef ALLOY_RUNTIME_THREAD_STATE_H_
 #define ALLOY_RUNTIME_THREAD_STATE_H_
 
+#include <string>
+
 #include <alloy/core.h>
 
 #include <alloy/memory.h>
@@ -32,7 +34,8 @@ class ThreadState {
   void* backend_data() const { return backend_data_; }
   void* raw_context() const { return raw_context_; }
 
-  virtual int Suspend(uint32_t timeout_ms = UINT_MAX) { return 1; }
+  int Suspend() { return Suspend(~0); }
+  virtual int Suspend(uint32_t timeout_ms) { return 1; }
   virtual int Resume(bool force = false) { return 1; }
 
   static void Bind(ThreadState* thread_state);