From a2fd50ef0c03de1a0bb6342d380e8d777c571669 Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Fri, 18 Dec 2009 15:28:37 -0500 Subject: [PATCH] change inline to __inline__ for better compatibility --- libust/buffers.h | 4 ++-- libust/tracer.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libust/buffers.h b/libust/buffers.h index 247c7b0..0191262 100644 --- a/libust/buffers.h +++ b/libust/buffers.h @@ -87,7 +87,7 @@ extern void *ust_buffers_offset_address(struct ust_buffer *buf, size_t offset); /* FIXME: lttng has a version for systems with inefficient unaligned access */ -static inline void ust_buffers_do_copy(void *dest, const void *src, size_t len) +static __inline__ void ust_buffers_do_copy(void *dest, const void *src, size_t len) { union { const void *src; @@ -113,7 +113,7 @@ static inline void ust_buffers_do_copy(void *dest, const void *src, size_t len) } /* FIXME: there is both a static inline and a '_' non static inline version ?? */ -static inline int ust_buffers_write(struct ust_buffer *buf, size_t offset, +static __inline__ int ust_buffers_write(struct ust_buffer *buf, size_t offset, const void *src, size_t len) { size_t cpy; diff --git a/libust/tracer.h b/libust/tracer.h index 880affa..b076754 100644 --- a/libust/tracer.h +++ b/libust/tracer.h @@ -112,7 +112,7 @@ enum marker_id { /* static ids 0-1 reserved for internal use. */ #define MARKER_CORE_IDS 2 -static inline enum marker_id marker_id_type(uint16_t id) +static __inline__ enum marker_id marker_id_type(uint16_t id) { if (id < MARKER_CORE_IDS) return (enum marker_id)id; @@ -279,7 +279,7 @@ struct ltt_subbuffer_header { * structure because gcc generates inefficient code on some architectures * (powerpc, mips..) */ -static inline size_t ltt_subbuffer_header_size(void) +static __inline__ size_t ltt_subbuffer_header_size(void) { return offsetof(struct ltt_subbuffer_header, header_end); } @@ -303,7 +303,7 @@ static inline size_t ltt_subbuffer_header_size(void) * The payload must itself determine its own alignment from the biggest type it * contains. * */ -static inline unsigned char ust_get_header_size( +static __inline__ unsigned char ust_get_header_size( struct ust_channel *channel, size_t offset, size_t data_size, @@ -355,7 +355,7 @@ static inline unsigned char ust_get_header_size( * * returns : offset where the event data must be written. */ -static inline size_t ltt_write_event_header(struct ltt_trace_struct *trace, +static __inline__ size_t ltt_write_event_header(struct ltt_trace_struct *trace, struct ust_buffer *buf, long buf_offset, u16 eID, size_t event_size, u64 tsc, unsigned int rflags) @@ -448,7 +448,7 @@ static inline size_t ltt_write_event_header(struct ltt_trace_struct *trace, * * Return : -ENOSPC if not enough space, else 0. */ -static inline int ltt_reserve_slot( +static __inline__ int ltt_reserve_slot( struct ltt_trace_struct *trace, struct ust_channel *channel, void **transport_data, -- 2.34.1