diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-03-26 23:44:53 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-03-26 23:44:53 +0200 |
| commit | 511eff7bf616a313e6fc2397db718a81e93847cc (patch) | |
| tree | bc8c7d40221e4f0d728e2c5b3eb0a9802b99d95f /libstore | |
| parent | d4b231dd9f874076c62f35590a9f6b93ca6481d7 (diff) | |
| parent | 69056411a354300a17d1e92027435c988508655d (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'libstore')
| -rw-r--r-- | libstore/store.h | 14 | ||||
| -rw-r--r-- | libstore/xinl.c | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/libstore/store.h b/libstore/store.h index fd250448..ae334a1d 100644 --- a/libstore/store.h +++ b/libstore/store.h @@ -33,11 +33,13 @@ #include <mach.h> #include <device/device.h> #include <hurd/hurd_types.h> +#include <features.h> -#ifndef STORE_EI -#define STORE_EI extern inline +#ifdef STORE_DEFINE_EI +#define STORE_EI +#else +#define STORE_EI __extern_inline #endif - /* Type for addresses inside the store. */ typedef off64_t store_offset_t; @@ -270,6 +272,10 @@ error_t store_set_child_flags (struct store *store, int flags); STORE's flags. */ error_t store_clear_child_flags (struct store *store, int flags); +extern int store_is_securely_returnable (struct store *store, int open_flags); + +#if defined(__USE_EXTERN_INLINES) || defined(STORE_DEFINE_EI) + /* Returns true if STORE can safely be returned to a user who has accessed it via a node using OPEN_FLAGS, without compromising security. */ STORE_EI int @@ -283,6 +289,8 @@ store_is_securely_returnable (struct store *store, int open_flags) || (flags & STORE_HARD_READONLY))); } +#endif /* Use extern inlines. */ + /* Fills in the values of the various fields in STORE that are derivable from the set of runs & the block size. */ void _store_derive (struct store *store); diff --git a/libstore/xinl.c b/libstore/xinl.c index a603d621..90242212 100644 --- a/libstore/xinl.c +++ b/libstore/xinl.c @@ -1,2 +1,2 @@ -#define STORE_EI +#define STORE_DEFINE_EI #include "store.h" |