diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2007-09-26 03:05:42 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2007-09-26 03:05:42 +0000 |
| commit | 5775a1dca89b6e358114da63c308d4f206c5d2b5 (patch) | |
| tree | 2aa450929fa97ead9b828c42d9757a60a1384499 /epan | |
| parent | 8a0da8123760f878752b6e4eca48a1d3198b08bf (diff) | |
The dissector packet-dcp.c now fails to compile on MacOS X (gcc 4.0.1/Apple). Change G_INLINE_FUNC back to inline per GLib documentation (also remove recommendation in developer's guide to not use inline):
http://library.gnome.org/devel/glib/unstable/glib-Miscellaneous-Macros.html#id2571572
G_INLINE_FUNC
#define G_INLINE_FUNC
This macro is used to export function prototypes so they can be linked with an external version when no inlining is performed. The file which implements the functions should define G_IMPLEMENTS_INLINES before including the headers which contain G_INLINE_FUNC declarations. Since inlining is very compiler-dependent using these macros correctly is very difficult. Their use is strongly discouraged.
This macro is often mistaken for a replacement for the inline keyword; inline is already declared in a portable manner in the glib headers and can be used normally.
svn path=/trunk/; revision=22980
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dcp.c b/epan/dissectors/packet-dcp.c index 576fb6f125..d23efa924e 100644 --- a/epan/dissectors/packet-dcp.c +++ b/epan/dissectors/packet-dcp.c @@ -549,7 +549,7 @@ static void dissect_options(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *d } /* end while() */ } /* compute DCCP checksum coverage according to RFC 4340, section 9 */ -static G_INLINE_FUNC guint dccp_csum_coverage(const e_dcphdr *dcph, guint len) +static inline guint dccp_csum_coverage(const e_dcphdr *dcph, guint len) { guint cov; |