diff options
| author | Christian Kampka <christian@kampka.net> | 2015-10-25 23:22:06 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-27 12:05:49 +0000 |
| commit | 0695cd3c0aba11fecba34c4b0aee652636cdfd82 (patch) | |
| tree | d787a362c9dd8066389054b1b03b7bb3354458ee /main/task/musl-fix.patch | |
| parent | 7c4cdfabc973c91316e2e2b05986a6eaeecb5bf3 (diff) | |
main/task: new upstream version 2.5.0
Diffstat (limited to 'main/task/musl-fix.patch')
| -rw-r--r-- | main/task/musl-fix.patch | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/main/task/musl-fix.patch b/main/task/musl-fix.patch index 4cc586980ca..54a5167d697 100644 --- a/main/task/musl-fix.patch +++ b/main/task/musl-fix.patch @@ -1,20 +1,16 @@ -diff --git a/src/Path.cpp b/src/Path.cpp -index 94657e2..6a82199 100644 ---- a/src/Path.cpp -+++ b/src/Path.cpp -@@ -38,6 +38,15 @@ - #include <Directory.h> - #include <Path.h> - -+/* fixes build with musl libc */ -+#ifndef GLOB_TILDE -+#define GLOB_TILDE 0 -+#endif -+ -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif -+ - //////////////////////////////////////////////////////////////////////////////// - std::ostream& operator<< (std::ostream& out, const Path& path) - { +diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp +index c67ed44..72da081 100644 +--- a/src/TLSClient.cpp ++++ b/src/TLSClient.cpp +@@ -36,11 +36,7 @@ + #include <string.h> + #include <sys/socket.h> + #include <arpa/inet.h> +-#if (defined OPENBSD || defined SOLARIS || defined NETBSD) + #include <errno.h> +-#else +-#include <sys/errno.h> +-#endif + #include <sys/types.h> + #include <sys/socket.h> + #include <netdb.h> |