Deal with C99 inline semantic.

3 files changed, 45 insertions, 1 deletions

diff --git a/mail/wmmail/distinfo b/mail/wmmail/distinfo
index 4a427dffef2..21127fd12a3 100644
--- a/mail/wmmail/distinfo
+++ b/mail/wmmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:59:30 agc Exp $
+$NetBSD: distinfo,v 1.5 2012/06/15 18:56:09 joerg Exp $
 
 SHA1 (WMMail.app-0.64.tar.gz) = 3077ab562fd97f7fee1505330eca60f9645ee6a9
 RMD160 (WMMail.app-0.64.tar.gz) = 9f8c7c3efce8de43785d2c7a6fa9286dec9fb6fe
@@ -6,3 +6,5 @@ Size (WMMail.app-0.64.tar.gz) = 147305 bytes
 SHA1 (patch-aa) = afeaff242ccf423a1e2ca3368941b6230185878e
 SHA1 (patch-ac) = 565d442850f7b406fad588dd5e045b465a40fbab
 SHA1 (patch-ad) = 13251a2ab4a656cf1452dc785d98e39b39aa7c94
+SHA1 (patch-src_list.h) = 747b32a70ecd05935f123d362dec996f98cf95aa
+SHA1 (patch-src_wmutil.c.in) = 71f1b7a97225a78371961cbe15cc1c793cc443fb
diff --git a/mail/wmmail/patches/patch-src_list.h b/mail/wmmail/patches/patch-src_list.h
new file mode 100644
index 00000000000..6380299b8da
--- /dev/null
+++ b/mail/wmmail/patches/patch-src_list.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_list.h,v 1.1 2012/06/15 18:56:09 joerg Exp $
+
+Kill broken inline use.
+
+--- src/list.h.orig	2012-06-15 18:10:58.000000000 +0000
++++ src/list.h
+@@ -19,7 +19,6 @@ You should have received a copy of the G
+ along with GNU CC; see the file COPYING.  If not, write to
+ the Free Software Foundation, 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.  */
+-
+ /* As a special exception, if you link this library with files compiled with
+    GCC to produce an executable, this does not cause the resulting executable
+    to be covered by the GNU General Public License. This exception does not
+@@ -29,11 +28,7 @@ Boston, MA 02111-1307, USA.  */
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
++#define INLINE
+ 
+ typedef struct LinkedList {
+   void *head;
diff --git a/mail/wmmail/patches/patch-src_wmutil.c.in b/mail/wmmail/patches/patch-src_wmutil.c.in
new file mode 100644
index 00000000000..3dee5a1556e
--- /dev/null
+++ b/mail/wmmail/patches/patch-src_wmutil.c.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_wmutil.c.in,v 1.1 2012/06/15 18:56:09 joerg Exp $
+
+Used by other source files.
+
+--- src/wmutil.c.in.orig	2012-06-15 18:11:58.000000000 +0000
++++ src/wmutil.c.in
+@@ -114,7 +114,7 @@ void *wrealloc(void *ptr, size_t newsize
+ }
+ 
+ 
+-inline void wfree(void *ptr)
++void wfree(void *ptr)
+ {
+   if (ptr != NULL)
+     free(ptr);