This is an automated email from the ASF dual-hosted git repository.

vnick pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit 487a7849caf09db0b6c21ca65477f79e16121709
Merge: d79f201f 41f9e630
Author: Virtually Nick <[email protected]>
AuthorDate: Mon Apr 21 12:00:11 2025 -0400

    Merge patch branch changes to main.

 src/guacd/daemon.c           |  7 +++++++
 src/libguac/display-flush.c  | 10 +++++++++-
 src/libguac/display-worker.c |  4 ----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --cc src/guacd/daemon.c
index 1701a366,378faffd..dab531cf
--- a/src/guacd/daemon.c
+++ b/src/guacd/daemon.c
@@@ -37,7 -37,7 +37,8 @@@
  #include <libgen.h>
  #include <netdb.h>
  #include <netinet/in.h>
 +#include <pthread.h>
+ #include <netinet/tcp.h>
  #include <signal.h>
  #include <stdio.h>
  #include <stdlib.h>

Reply via email to