Attachment 198498 Details for Bug 232560 – patch

[patch] patch

telldus-core.patch (text/plain), 1.90 KB, created by Piotr Kubaj on 2018-10-23 13:58:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2018-10-23 13:58:53 UTC

Size: 1.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 482837)
>+++ Makefile	(working copy)
>@@ -17,9 +17,6 @@
> 		libconfuse.so:devel/libconfuse \
> 		libargp.so:devel/argp-standalone
> 
>-BROKEN_powerpc64=	Does not build: error: strlen was not declared in this scope
>-BROKEN_sparc64=		Does not build: error: strlen was not declared in this scope
>-
> USE_LDCONFIG=	yes
> USES=		cmake compiler:c++11-lang iconv:wchar_t
> 
>Index: files/patch-common-Socket_unix.cpp
>===================================================================
>--- files/patch-common-Socket_unix.cpp	(revision 482837)
>+++ files/patch-common-Socket_unix.cpp	(working copy)
>@@ -1,6 +1,13 @@
>---- common/Socket_unix.cpp
>+--- common/Socket_unix.cpp.orig	2014-03-31 10:30:09 UTC
> +++ common/Socket_unix.cpp
>-@@ -18,7 +18,7 @@
>+@@ -12,13 +12,14 @@
>+ #include <fcntl.h>
>+ #include <math.h>
>+ #include <string>
>++#include <cstring>
>+ 
>+ #include "common/Socket.h"
>+ #include "common/Mutex.h"
>  #include "common/Strings.h"
>  
>  #define BUFSIZE 512
>@@ -9,7 +16,7 @@
>  	#define SOCK_CLOEXEC 0
>  #endif
>  
>-@@ -128,8 +128,10 @@ std::wstring Socket::read(int timeout) {
>+@@ -128,8 +129,10 @@ std::wstring Socket::read(int timeout) {
>  
>  void Socket::stopReadWait() {
>  	TelldusCore::MutexLocker locker(&d->mutex);
>Index: files/patch-service-ConnectionListener_unix.cpp
>===================================================================
>--- files/patch-service-ConnectionListener_unix.cpp	(revision 482837)
>+++ files/patch-service-ConnectionListener_unix.cpp	(working copy)
>@@ -1,6 +1,11 @@
>---- service/ConnectionListener_unix.cpp
>+--- service/ConnectionListener_unix.cpp.orig	2014-03-31 10:30:09 UTC
> +++ service/ConnectionListener_unix.cpp
>-@@ -17,7 +17,7 @@
>+@@ -13,11 +13,12 @@
>+ #include <fcntl.h>
>+ #include <errno.h>
>+ #include <string>
>++#include <cstring>
>+ 
>  #include "service/ConnectionListener.h"
>  #include "common/Socket.h"
>

Actions: View | Diff

Attachments on bug 232560: 198498