 +extern char * unrtf_realloc(char*, unsigned long, unsigned long);
 +extern unsigned long total_malloced (void);
 +extern char * unrtf_strdup (struct ConversionContext *, char*);
-diff -durpN unrtf-0.21.2.old/src/malloc.h~ unrtf-0.21.2/src/malloc.h~
---- unrtf-0.21.2.old/src/malloc.h~	1969-12-31 19:00:00.000000000 -0500
-+++ unrtf-0.21.2/src/malloc.h~	2012-08-21 13:33:44.825682713 -0400
-@@ -0,0 +1,41 @@
-+/*=============================================================================
-+   GNU UnRTF, a command-line program to convert RTF documents to other formats.
-+   Copyright (C) 2000,2001,2004 by Zachary Smith
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-+
-+   The maintainer is reachable by electronic mail at daved@physiol.usyd.edu.au
-+=============================================================================*/
-+
-+
-+/*----------------------------------------------------------------------
-+ * Module name:    malloc
-+ * Author name:    Zachary Smith
-+ * Create date:    1 Aug 2001
-+ * Purpose:        Definitions for memory management.
-+ *----------------------------------------------------------------------
-+ * Changes:
-+ * 29 Mar 05, daved@physiol.usyd.edu.au: changes requested by ZT Smith
-+ * 16 Dec 07, daved@physiol.usyd.edu.au: updated to GPL v3
-+ * 09 Nov 08, arkadiusz.firus@gmail.com: added my_realloc
-+ *--------------------------------------------------------------------*/
-+
-+struct ConversionContext;
-+
-+extern char * my_malloc (unsigned long);
-+extern void my_free (char*);
-+extern char * my_realloc(char*, unsigned long, unsigned long);
-+extern unsigned long total_malloced (void);
-+extern char * my_strdup (struct ConversionContext *, char*);
 diff -durpN unrtf-0.21.2.old/src/my_iconv.c unrtf-0.21.2/src/my_iconv.c
---- unrtf-0.21.2.old/src/my_iconv.c	2010-08-16 00:12:43.000000000 -0400
-+++ unrtf-0.21.2/src/my_iconv.c	2012-08-21 13:38:56.753687604 -0400
+--- unrtf-0.21.2.old/src/my_iconv.c	2010-08-16 06:12:43.000000000 +0200
++++ unrtf-0.21.2/src/my_iconv.c	2013-01-17 02:41:09.685864239 +0100
 @@ -12,154 +12,133 @@
  #include <stdio.h>
  #include <string.h>

 #define FONT_SYMBOL "SYMBOL"
 
diff -durpN unrtf-0.21.2.old/src/defs.h unrtf-0.21.2/src/defs.h
--- unrtf-0.21.2.old/src/defs.h	2010-07-03 22:30:58.000000000 -0400
+++ unrtf-0.21.2/src/defs.h	2012-08-21 13:33:44.817682703 -0400
@@ -64,9 +64,6 @@
 #define SKIP_ONE_WORD	2
 #endif

 
+#endif /* _MY_ICONV */
diff -durpN unrtf-0.21.2.old/src/output.c unrtf-0.21.2/src/output.c
--- unrtf-0.21.2.old/src/output.c	2011-06-07 14:04:38.000000000 +0200
+++ unrtf-0.21.2/src/output.c	2013-01-17 02:41:09.685864239 +0100
@@ -1,23 +1,23 @@
 /*=============================================================================
-   GNU UnRTF, a command-line program to convert RTF documents to other formats.
