diff mbox

[4/4] transmission: Fix build error "conflicting types for 'UTP_Write'" after version bump

Message ID BLU0-SMTP287B7593393BF8A5143ED5FD9CB0@phx.gbl
State Superseded
Headers show

Commit Message

Bernd Kuhls Jan. 2, 2014, 7:28 p.m. UTC
fix taken from http://www.adminsehow.com/2012/10/how-to-install-transmission-2-71-on-debian-6-0-squeeze/

compile tested on arch sh4, fixes
http://autobuild.buildroot.org/results/638/63884de929fb7339ebf44b08cb5d1ab30010666a/

should also fix powerpc
http://autobuild.buildroot.org/results/eb4/eb486228a11a9602d4bf40e771744d2b2b40508f/

Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
---
 package/transmission/transmission-fix-utypes.patch |   22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/transmission/transmission-fix-utypes.patch

Comments

Bernd Kuhls Jan. 2, 2014, 7:31 p.m. UTC | #1
Bernd Kuhls <berndkuhls@hotmail.com> wrote in
news:BLU0-SMTP287B7593393BF8A5143ED5FD9CB0@phx.gbl: 

Sorry, subject should have been [PATCH 1/1] ;)
Thomas Petazzoni Jan. 2, 2014, 9:21 p.m. UTC | #2
Dear Bernd Kuhls,

On Thu, 2 Jan 2014 20:28:49 +0100, Bernd Kuhls wrote:
> fix taken from http://www.adminsehow.com/2012/10/how-to-install-transmission-2-71-on-debian-6-0-squeeze/
> 
> compile tested on arch sh4, fixes
> http://autobuild.buildroot.org/results/638/63884de929fb7339ebf44b08cb5d1ab30010666a/
> 
> should also fix powerpc
> http://autobuild.buildroot.org/results/eb4/eb486228a11a9602d4bf40e771744d2b2b40508f/
> 
> Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
> ---
>  package/transmission/transmission-fix-utypes.patch |   22 ++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 package/transmission/transmission-fix-utypes.patch
> 
> diff --git a/package/transmission/transmission-fix-utypes.patch b/package/transmission/transmission-fix-utypes.patch
> new file mode 100644
> index 0000000..74f3d32
> --- /dev/null
> +++ b/package/transmission/transmission-fix-utypes.patch

Thanks, but please add a description + Signed-off-by inside the patch
itself. It should also point to where you found the patch.

See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches

Thanks!

Thomas
diff mbox

Patch

diff --git a/package/transmission/transmission-fix-utypes.patch b/package/transmission/transmission-fix-utypes.patch
new file mode 100644
index 0000000..74f3d32
--- /dev/null
+++ b/package/transmission/transmission-fix-utypes.patch
@@ -0,0 +1,22 @@ 
+diff -uNr transmission-2.82.org/third-party/libutp/utypes.h transmission-2.82/third-party/libutp/utypes.h
+--- transmission-2.82.org/third-party/libutp/utypes.h	2013-08-09 04:47:43.000000000 +0200
++++ transmission-2.82/third-party/libutp/utypes.h	2014-01-02 20:17:18.000000000 +0100
+@@ -35,8 +35,15 @@
+ typedef const char * cstr;
+ typedef char * str;
+ 
+-#ifndef __cplusplus
+-typedef uint8 bool;
+-#endif
++//#ifndef __cplusplus
++//typedef uint8 bool;
++//#endif
++#ifndef __cplusplus
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#else
++typedef uint8 bool;
++#endif
++#endif
+ 
+ #endif //__UTYPES_H__