$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
@@ -63,14 +63,25 @@ struct memcache_buf	*mcm_buf_find_replac
 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 *);
+static inline u_int32_t
+mcm_buf_len(const struct memcache_ctxt *ctxt, const struct memcache_buf *s) {
+  return s->len;
+}
 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 *);
+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);
+}
+
+
+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;
+}
 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 *);