sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

torsocks: Fix building with unified headers

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-06-30 23:39:32 +02:00
parent 3436267b24
commit 43332737df
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/torsocks/src-lib-torsocks.h.patch
View File

@ -1,21 +1,12 @@
diff -u -r ../torsocks-2.2.0/src/lib/torsocks.h ./src/lib/torsocks.h
--- ../torsocks-2.2.0/src/lib/torsocks.h 2016-10-18 12:44:01.000000000 -0400
+++ ./src/lib/torsocks.h 2016-12-20 21:22:07.973637763 -0500
@@ -167,7 +167,7 @@
#define LIBC_GETHOSTBYADDR_R_NAME gethostbyaddr_r
#define LIBC_GETHOSTBYADDR_R_NAME_STR XSTR(LIBC_GETHOSTBYADDR_R_NAME)
#define LIBC_GETHOSTBYADDR_R_RET_TYPE int
-#define LIBC_GETHOSTBYADDR_R_SIG const void *addr, socklen_t len, int type, \
+#define LIBC_GETHOSTBYADDR_R_SIG const void *addr, int len, int type, \
struct hostent *hret, char *buf, size_t buflen, \
struct hostent **result, int *h_errnop
#define LIBC_GETHOSTBYADDR_R_ARGS addr, len, type, hret, buf, \
@@ -197,7 +197,7 @@
/* recvmsg(2) */
#define LIBC_RECVMSG_NAME recvmsg
#define LIBC_RECVMSG_NAME_STR XSTR(LIBC_RECVMSG_NAME)
-#define LIBC_RECVMSG_RET_TYPE ssize_t
+#define LIBC_RECVMSG_RET_TYPE int
#define LIBC_RECVMSG_SIG \
int sockfd, struct msghdr *msg, int flags
#define LIBC_RECVMSG_ARGS \
diff -u -r ../torsocks-87b075dd16c675606adee792ef1e22691c51475b/src/lib/torsocks.h ./src/lib/torsocks.h
--- ../torsocks-87b075dd16c675606adee792ef1e22691c51475b/src/lib/torsocks.h 2016-12-22 16:45:31.000000000 +0100
+++ ./src/lib/torsocks.h 2017-06-30 23:28:56.028584667 +0200
@@ -314,7 +316,7 @@
extern TSOCKS_LIBC_DECL(sendto, LIBC_SENDTO_RET_TYPE, LIBC_SENDTO_SIG)
TSOCKS_DECL(sendto, LIBC_SENDTO_RET_TYPE, LIBC_SENDTO_SIG)
#define LIBC_SENDTO_DECL \
- LIBC_SENDTO_RET_TYPE LIBC_SENDTO_NAME(LIBC_SENDTO_SIG)
+ LIBC_SENDTO_RET_TYPE LIBC_SENDTO_NAME(LIBC_SENDTO_SIG) __overloadable
/* socket(2) */
extern TSOCKS_LIBC_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG)