aboutsummaryrefslogtreecommitdiffstats
path: root/testing/torsocks/musl-fix.patch
blob: a394aaea859b1e95179a049d7a0a93b7746c7ec4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
diff -u -r torsocks-2.1.0.orig/src/common/compat.c torsocks-2.1.0/src/common/compat.c
--- torsocks-2.1.0.orig/src/common/compat.c	2015-12-06 19:44:47.251991190 +0100
+++ torsocks-2.1.0/src/common/compat.c	2015-12-06 19:44:58.871959984 +0100
@@ -19,8 +19,6 @@
 
 #include "compat.h"
 
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
-
 /*
  * Initialize a pthread mutex. This never fails.
  */
@@ -95,5 +93,3 @@
 	}
 	tsocks_mutex_unlock(&o->mutex);
 }
-
-#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
diff -u -r torsocks-2.1.0.orig/src/common/compat.h torsocks-2.1.0/src/common/compat.h
--- torsocks-2.1.0.orig/src/common/compat.h	2015-12-06 19:44:47.251991190 +0100
+++ torsocks-2.1.0/src/common/compat.h	2015-12-06 19:44:51.538646345 +0100
@@ -22,8 +22,6 @@
 #define __darwin__	1
 #endif
 
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
-
 #define RTLD_NEXT	((void *) -1)
 
 #include <pthread.h>
@@ -53,10 +51,6 @@
 
 void tsocks_once(tsocks_once_t *o, void (*init_routine)(void));
 
-#else
-#error "OS not supported."
-#endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
-
 #if defined(__linux__)
 #include <unistd.h>
 #include <sys/syscall.h>
diff -u -r torsocks-2.1.0.orig/src/common/ref.h torsocks-2.1.0/src/common/ref.h
--- torsocks-2.1.0.orig/src/common/ref.h	2015-12-06 19:44:47.251991190 +0100
+++ torsocks-2.1.0/src/common/ref.h	2015-12-06 19:44:51.538646345 +0100
@@ -26,8 +26,6 @@
 	long count;
 };
 
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
-
 /*
  * Get a reference by incrementing the refcount.
  */
@@ -55,8 +53,4 @@
 	}
 }
 
-#else
-#error "OS not supported"
-#endif /* __GLIBC__, __FreeBSD__, __darwin__ */
-
 #endif /* TORSOCKS_REF_H */
diff -u -r torsocks-2.1.0.orig/src/lib/torsocks.h torsocks-2.1.0/src/lib/torsocks.h
--- torsocks-2.1.0.orig/src/lib/torsocks.h	2015-12-06 19:44:47.251991190 +0100
+++ torsocks-2.1.0/src/lib/torsocks.h	2015-12-06 19:44:51.538646345 +0100
@@ -33,8 +33,6 @@
 #define TSOCKS_DECL(name, type, sig) \
 	extern type tsocks_##name(sig);
 
-#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__) || defined(__NetBSD__))
-
 /* connect(2) */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -205,9 +203,6 @@
 	int sockfd, int backlog
 #define LIBC_LISTEN_ARGS sockfd, backlog
 
-#else
-#error "OS not supported."
-#endif /* __GLIBC__ , __FreeBSD__, __darwin__, __NetBSD__ */
 
 #if (defined(__linux__))