60d3b4e5c4
Update first patch to fix build of transmission 3.00 with UTP. Since upstream commit f27596238d37 (Include stdbool.h unconditionally), upstream no longer ever defines HAVE_STDBOOL_H, so we always fallback to manually defining 'bool' which conflicts with the type used elsewhere in the code. Drop our workaround, to always include stdbool.h unconditionally. Fixes: - http://autobuild.buildroot.org/results/bbfb61cf911fb29dcc02626f6eb47fff9e5e64f5 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> [yann.morin.1998@free.fr: - expand commit log - drop commented-out code - restore CR-LF line endings in replacement code, as used by upstream ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
31 lines
1005 B
Diff
31 lines
1005 B
Diff
Fix build error "conflicting types for 'UTP_Write'"
|
|
|
|
Fetch from: http://www.adminsehow.com/2012/10/how-to-install-transmission-2-71-on-debian-6-0-squeeze/
|
|
|
|
The corresponding upstream bug report (unfixed) can be found here:
|
|
https://trac.transmissionbt.com/ticket/5232
|
|
|
|
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
|
|
[Fabrice: adapt to 3.00, which always uses stdbool.h]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[yann.morin.1998@free.fr:
|
|
- don't comment-out dropped code, just drop it
|
|
- use CR-LF in replacement code, as used by upstream
|
|
]
|
|
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
|
|
|
--- 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,8 @@
|
|
typedef const char * cstr;
|
|
typedef char * str;
|
|
|
|
-#ifndef __cplusplus
|
|
-typedef uint8 bool;
|
|
-#endif
|
|
+#ifndef __cplusplus
|
|
+#include <stdbool.h>
|
|
+#endif
|
|
|
|
#endif //__UTYPES_H__
|