diff options
Diffstat (limited to 'patches/libmemcache-1.4.0.rc2/0005-remove-broken-inline.patch')
-rw-r--r-- | patches/libmemcache-1.4.0.rc2/0005-remove-broken-inline.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/patches/libmemcache-1.4.0.rc2/0005-remove-broken-inline.patch b/patches/libmemcache-1.4.0.rc2/0005-remove-broken-inline.patch new file mode 100644 index 000000000..8d6e44f17 --- /dev/null +++ b/patches/libmemcache-1.4.0.rc2/0005-remove-broken-inline.patch @@ -0,0 +1,66 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 22 Dec 2011 10:30:24 +0100 +Subject: [PATCH] remove broken inline + +Without this we may get something like this: + +[...]/libmemcache.so: undefined reference to `mcm_buf_len' +[...]/libmemcache.so: undefined reference to `mcm_buf_remain_off' + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + include/memcache/buffer.h | 6 +++--- + src/buffer.c | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/include/memcache/buffer.h b/include/memcache/buffer.h +index 2205b23..d352377 100644 +--- a/include/memcache/buffer.h ++++ b/include/memcache/buffer.h +@@ -63,14 +63,14 @@ struct memcache_buf *mcm_buf_find_replace(struct memcache_ctxt *, struct memcach + struct memcache_buf *mcm_buf_find_replace2(struct memcache_ctxt *, struct memcache_buf *, + 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 *); ++u_int32_t mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *); + struct memcache_buf *mcm_buf_new(struct memcache_ctxt *); + struct memcache_buf *mcm_buf_new2(struct memcache_ctxt *, const char *, const u_int32_t); + struct memcache_buf *mcm_buf_new3(struct memcache_ctxt *, const char *); + size_t mcm_buf_read(struct memcache_ctxt *, struct memcache_buf *, int); + 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 *); ++size_t mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *); ++size_t mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *); + int mcm_buf_replace(struct memcache_ctxt *, struct memcache_buf *, const char *, const u_int32_t); + int mcm_buf_replace2(struct memcache_ctxt *, struct memcache_buf *, const char *); + int mcm_buf_replace_buf(struct memcache_ctxt *, struct memcache_buf *, struct memcache_buf *); +diff --git a/src/buffer.c b/src/buffer.c +index 616307f..3934a7d 100644 +--- a/src/buffer.c ++++ b/src/buffer.c +@@ -259,7 +259,7 @@ mcm_buf_free(struct memcache_ctxt *ctxt, struct memcache_buf **buf) { + } + + +-inline u_int32_t ++u_int32_t + mcm_buf_len(const struct memcache_ctxt *ctxt, const struct memcache_buf *s) { + return s->len; + } +@@ -425,13 +425,13 @@ mcm_buf_realloc(struct memcache_ctxt *ctxt, struct memcache_buf *buf, const u_in + } + + +-inline size_t ++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 ++size_t + mcm_buf_remain_off(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) { + return mcm_buf_len(ctxt, buf) - buf->off; + } |