diff options
| author | dmcmahill <dmcmahill> | 2010-02-02 07:14:29 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2010-02-02 07:14:29 +0000 |
| commit | d654db109a331fd098468a41e4c0f4b604573270 (patch) | |
| tree | 3f4aba2e530bd905b87233d28c450df345d84d70 /devel/libmemcache | |
| parent | 641a12216e1c70784f479f59637705ffab0f732a (diff) | |
| download | pkgsrc-d654db109a331fd098468a41e4c0f4b604573270.tar.gz | |
Change some functions from 'inline' to 'static inline' to avoid multiply
defined symbols with gcc-4.1.3. Problem noted by Joerg@.
Diffstat (limited to 'devel/libmemcache')
| -rw-r--r-- | devel/libmemcache/distinfo | 4 | ||||
| -rw-r--r-- | devel/libmemcache/patches/patch-ac | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/libmemcache/distinfo b/devel/libmemcache/distinfo index 1fd037fca41..4f5e0dbd6ff 100644 --- a/devel/libmemcache/distinfo +++ b/devel/libmemcache/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2010/01/29 03:44:53 dmcmahill Exp $ +$NetBSD: distinfo,v 1.4 2010/02/02 07:14:29 dmcmahill Exp $ SHA1 (libmemcache-1.4.0.b9.tar.bz2) = 09f8e059a7833a207b7dfbf6e30a42309801fdc9 RMD160 (libmemcache-1.4.0.b9.tar.bz2) = 8c97e89df37956584f743639440dd980fd277b92 Size (libmemcache-1.4.0.b9.tar.bz2) = 284358 bytes SHA1 (patch-aa) = 379b0117e70316b02f61190d10e64fe04a765619 SHA1 (patch-ab) = fa91a0f9b9e6ed9c1d7abd4c7eb69f63045f5869 -SHA1 (patch-ac) = f7dfb29b2e7f9c56d5d5bcb3c8dd63bb6f26825f +SHA1 (patch-ac) = bef510ea79e98e8bd3eafa6ad05026858bb87ef1 diff --git a/devel/libmemcache/patches/patch-ac b/devel/libmemcache/patches/patch-ac index 59ced9aba34..cf156e11a63 100644 --- a/devel/libmemcache/patches/patch-ac +++ b/devel/libmemcache/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2010/01/29 03:44:53 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2010/02/02 07:14:29 dmcmahill Exp $ --- include/memcache/buffer.h.orig 2005-09-25 17:36:12.000000000 +0000 +++ include/memcache/buffer.h @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1 2010/01/29 03:44:53 dmcmahill Exp $ const char *, struct memcache_buf *); int mcm_buf_free(struct memcache_ctxt *, struct memcache_buf **); -inline u_int32_t mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *); -+inline u_int32_t ++static inline u_int32_t +mcm_buf_len(const struct memcache_ctxt *ctxt, const struct memcache_buf *s) { + return s->len; +} @@ -18,13 +18,13 @@ $NetBSD: patch-ac,v 1.1 2010/01/29 03:44:53 dmcmahill Exp $ int mcm_buf_realloc(struct memcache_ctxt *, struct memcache_buf *, const u_int32_t); -inline size_t mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *); -inline size_t mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *); -+inline size_t ++static inline size_t +mcm_buf_remain(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) { + return mcm_buf_size(ctxt, buf) - mcm_buf_len(ctxt, buf); +} + + -+inline size_t ++static inline size_t +mcm_buf_remain_off(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) { + return mcm_buf_len(ctxt, buf) - buf->off; +} |