From 66944bd09785f0cdddf66c3d22df5fcc7bafac25 Mon Sep 17 00:00:00 2001
From: Matthew Parkinson <mattpark@microsoft.com>
Date: Wed, 27 May 2020 10:50:11 +0100
Subject: [PATCH] Fix includes for the OE Pal.

The Pal should include address.h, this was masked as other Pals included
it, but are only included for simulating OE scenarios, rather than
the actual build for OE.
---
 src/pal/pal.h              | 6 +++---
 src/pal/pal_open_enclave.h | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pal/pal.h b/src/pal/pal.h
index d8a106c5f..1324c530f 100644
--- a/src/pal/pal.h
+++ b/src/pal/pal.h
@@ -3,6 +3,9 @@
 #include "pal_consts.h"
 
 // If simultating OE, then we need the underlying platform
+#if defined(OPEN_ENCLAVE)
+#  include "pal_open_enclave.h"
+#endif
 #if !defined(OPEN_ENCLAVE) || defined(OPEN_ENCLAVE_SIMULATION)
 #  include "pal_apple.h"
 #  include "pal_freebsd.h"
@@ -12,9 +15,6 @@
 #  include "pal_openbsd.h"
 #  include "pal_windows.h"
 #endif
-#if defined(OPEN_ENCLAVE)
-#  include "pal_open_enclave.h"
-#endif
 #include "pal_plain.h"
 
 namespace snmalloc
diff --git a/src/pal/pal_open_enclave.h b/src/pal/pal_open_enclave.h
index 77101dba5..5e37e0438 100644
--- a/src/pal/pal_open_enclave.h
+++ b/src/pal/pal_open_enclave.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "ds/address.h"
 #include "pal_plain.h"
 #ifdef OPEN_ENCLAVE
 extern "C" const void* __oe_get_heap_base();