diff options
author | marcus <marcus> | 2004-10-06 18:32:47 +0000 |
---|---|---|
committer | marcus <marcus> | 2004-10-06 18:32:47 +0000 |
commit | 20aed9ff71432b08ec82fd81cfe5f1467135bec1 (patch) | |
tree | 85c5eab5e6fb3c19e323684359fd81890641f88f | |
parent | 7c8aa6b5af257a5c41208df95f44192849eb115e (diff) |
2004-10-06 Marcus Brinkmann <marcus@gnu.org>
* l4/compat/space.h: Change all tests for _cplusplus to tests
for __cplusplus.
(L4_FlushFpage) [!__cplusplus]: Rename to ...
(L4_FlushFpages) [!__cplusplus]: ... this.
-rw-r--r-- | libl4/ChangeLog | 3 | ||||
-rw-r--r-- | libl4/l4/compat/space.h | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libl4/ChangeLog b/libl4/ChangeLog index 1863c9b..91bab4b 100644 --- a/libl4/ChangeLog +++ b/libl4/ChangeLog @@ -1,5 +1,8 @@ 2004-10-06 Marcus Brinkmann <marcus@gnu.org> + * l4/compat/space.h (L4_FlushFpage) [!__cplusplus]: Rename to ... + (L4_FlushFpages) [!__cplusplus]: ... this. + * l4/gnu/space.h (L4_FPAGE_READ_WRITE_ONLY): Define macro. * l4/space.h (_L4_read_write_only): Define macro. * l4/compat/space.h (L4_ReadWriteOnly): Define macro. diff --git a/libl4/l4/compat/space.h b/libl4/l4/compat/space.h index 6775a70..c1b0a5f 100644 --- a/libl4/l4/compat/space.h +++ b/libl4/l4/compat/space.h @@ -114,7 +114,7 @@ L4_Set_Rights (L4_Fpage_t *fpage, L4_Word_t AccessRights) static inline L4_Fpage_t _L4_attribute_always_inline -#ifdef _cplusplus +#ifdef __cplusplus operator + (const L4_Fpage_t l, const L4_Word_t r) #else L4_FpageAddRights (L4_Fpage_t l, L4_Word_t r) @@ -129,7 +129,7 @@ L4_FpageAddRights (L4_Fpage_t l, L4_Word_t r) static inline L4_Fpage_t _L4_attribute_always_inline -#ifdef _cplusplus +#ifdef __cplusplus operator - (const L4_Fpage_t l, const L4_Word_t r) #else L4_FpageRemoveRights (const L4_Fpage_t l, const L4_Word_t r) @@ -142,7 +142,7 @@ L4_FpageRemoveRights (const L4_Fpage_t l, const L4_Word_t r) } -#ifdef _cplusplus +#ifdef __cplusplus static inline L4_Fpage_t& _L4_attribute_always_inline @@ -199,7 +199,7 @@ L4_Unmap (L4_Word_t control) static inline L4_Fpage_t _L4_attribute_always_inline -#ifdef _cplusplus +#ifdef __cplusplus L4_Unmap (L4_Fpage_t fpage) #else L4_UnmapFpage (L4_Fpage_t fpage) @@ -212,7 +212,7 @@ L4_UnmapFpage (L4_Fpage_t fpage) static inline void _L4_attribute_always_inline -#ifdef _cplusplus +#ifdef __cplusplus L4_Unmap (L4_Word_t n, L4_Fpage_t *fpages) #else L4_UnmapFpages (L4_Word_t n, L4_Fpage_t *fpages) @@ -233,10 +233,10 @@ L4_Flush (L4_Fpage_t fpage) static inline void _L4_attribute_always_inline -#ifdef _cplusplus +#ifdef __cplusplus L4_Flush (L4_Word_t n, L4_Fpage_t *fpages) #else -L4_FlushFpage (L4_Word_t n, L4_Fpage_t *fpages) +L4_FlushFpages (L4_Word_t n, L4_Fpage_t *fpages) #endif { _L4_flush_fpages (n, &fpages[0].raw); |