- Fix inline problems

- portlint

PR:		143004
Notified by:	Jose Alfonso Accino <accino___uma.es>

2 files changed, 71 insertions, 1 deletions

diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile
index c0779a93b2f9..83b5b3c9d818 100644
--- a/databases/libmemcache/Makefile
+++ b/databases/libmemcache/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	libmemcache
-PORTVERSION=	1.4.0.rc2
+DISTVERSION=	1.4.0.rc2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://people.FreeBSD.org/~seanc/libmemcache/
 
diff --git a/databases/libmemcache/files/patch-fix-inline b/databases/libmemcache/files/patch-fix-inline
new file mode 100644
index 000000000000..dde3cb63ef54
--- /dev/null
+++ b/databases/libmemcache/files/patch-fix-inline
@@ -0,0 +1,69 @@
+--- include/memcache/buffer.h.orig	2010-01-31 13:27:07.000000000 -0200
++++ include/memcache/buffer.h	2010-01-31 13:27:21.000000000 -0200
+@@ -63,14 +63,14 @@
+ 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 *);
+--- include/memcache.h.in.orig	2010-01-31 13:29:55.000000000 -0200
++++ include/memcache.h.in	2010-01-31 13:30:04.000000000 -0200
+@@ -923,7 +923,7 @@
+ 		 mcMallocFunc *mallocAtomicFunc, mcReallocFunc *reallocFunc);
+ 
+ /* Returns a pointer to the global context. */
+-inline struct memcache_ctxt *mc_global_ctxt(void);
++struct memcache_ctxt *mc_global_ctxt(void);
+ 
+ /* The next two functions are used to setup an error handler. */
+ int	mcErrSetup(mcErrFunc errFunc);
+--- src/buffer.c.orig	2010-01-31 13:27:33.000000000 -0200
++++ src/buffer.c	2010-01-31 13:27:43.000000000 -0200
+@@ -259,7 +259,7 @@
+ }
+ 
+ 
+-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 @@
+ }
+ 
+ 
+-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;
+ }
+--- src/memcache.c.orig	2010-01-31 13:27:50.000000000 -0200
++++ src/memcache.c	2010-01-31 13:29:28.000000000 -0200
+@@ -278,7 +278,7 @@
+ }
+ 
+ 
+-inline struct memcache_ctxt *
++struct memcache_ctxt *
+ mc_global_ctxt(void) {
+   return &mcGlobalCtxt;
+ }