| Message ID | BLU0-SMTP20778F191E3944FD27E1226D9B50@phx.gbl |
|---|---|
| State | Accepted |
| Commit | c991fabfcfb1984befc7a9ea5701f7de507b16fb |
| Headers | show |
Bernd Kuhls <berndkuhls@hotmail.com> wrote in
news:BLU0-SMTP20778F191E3944FD27E1226D9B50@phx.gbl:
> Upstream code has DOS line endings...
Hi,
as I am not sure whether sending a patch with DOS line
endings will work with git-send-email I am attaching
the patch file to this post.
In other words: following line numbers of the patch file
have to have a DOS line ending: 13-18, 29-30.
Regards, Bernd
>>>>> "Bernd" == Bernd Kuhls <berndkuhls@hotmail.com> writes: > Upstream code has DOS line endings... > Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> Committed, thanks.
diff --git a/package/transmission/transmission-01-fix-utypes.patch b/package/transmission/transmission-01-fix-utypes.patch index e67ba6a..96403a6 100644 --- a/package/transmission/transmission-01-fix-utypes.patch +++ b/package/transmission/transmission-01-fix-utypes.patch @@ -10,12 +10,12 @@ Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> --- 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 + typedef const char * cstr; + typedef char * str; + +-#ifndef __cplusplus +-typedef uint8 bool; +-#endif +//#ifndef __cplusplus +//typedef uint8 bool; +//#endif @@ -26,5 +26,5 @@ Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> +typedef uint8 bool; +#endif +#endif - - #endif //__UTYPES_H__ + + #endif //__UTYPES_H__
Upstream code has DOS line endings... Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> --- fixes http://autobuild.buildroot.net/results/f24/f245aab1dad05340a50a6f4c42c8b40ffde836ea/ .../transmission/transmission-01-fix-utypes.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)