-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net-libs/libwebsockets: Fix compile issue.
Closes: https://bugs.gentoo.org/704180 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Jaco Kroon <jaco@uls.co.za>
- Loading branch information
Showing
2 changed files
with
31 additions
and
1 deletion.
There are no files selected for viewing
29 changes: 29 additions & 0 deletions
29
net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
From a27dabfd3a422a348135e49ffd4f163cc5c6baae Mon Sep 17 00:00:00 2001 | ||
From: Jaco Kroon <jaco@iewc.co.za> | ||
Date: Mon, 6 Jan 2020 11:52:54 +0200 | ||
Subject: [PATCH] lws_create_vhost compile failure with +SOCKS5 -client. | ||
|
||
If LWS is build with SOCKS5 support, but WITHOUT_CLIENT then a compile | ||
failure occurs which this fixes. | ||
|
||
Signed-off-by: Jaco Kroon <jaco@iewc.co.za> | ||
--- | ||
lib/core-net/vhost.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/lib/core-net/vhost.c b/lib/core-net/vhost.c | ||
index 69fe26a5..283b802e 100644 | ||
--- a/lib/core-net/vhost.c | ||
+++ b/lib/core-net/vhost.c | ||
@@ -437,7 +437,7 @@ lws_create_vhost(struct lws_context *context, | ||
struct lws_protocols *lwsp; | ||
int m, f = !info->pvo, fx = 0, abs_pcol_count = 0; | ||
char buf[96]; | ||
-#if !defined(LWS_WITHOUT_CLIENT) && defined(LWS_HAVE_GETENV) | ||
+#if (!defined(LWS_WITHOUT_CLIENT) || defined(LWS_WITH_SOCKS5)) && defined(LWS_HAVE_GETENV) | ||
char *p; | ||
#endif | ||
int n; | ||
-- | ||
2.23.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters