Skip to content

Commit

Permalink
Fix includes for the OE Pal.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mjp41 committed May 27, 2020
1 parent de0ab1d commit 2c9ab30
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/pal/pal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/pal/pal_open_enclave.h
Original file line number Diff line number Diff line change
@@ -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();
Expand Down

0 comments on commit 2c9ab30

Please sign in to comment.