This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch staging/1.5.4 in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit 171219c95f3813a9d251cb20e261cb5e2bd41134 Merge: 5e0fb229 2769e5ff Author: Mike Jumper <[email protected]> AuthorDate: Wed Aug 30 14:52:58 2023 -0700 GUACAMOLE-1846: Merge correction to build failures on older GCC (including making guac_rwlock public). src/guacd/daemon.c | 3 +- src/guacd/proc.c | 3 +- src/libguac/Makefile.am | 4 +- src/libguac/client.c | 71 +++++++++++----------- src/libguac/guacamole/client.h | 6 +- .../{reentrant-rwlock.h => guacamole/rwlock.h} | 53 ++++++++-------- src/libguac/{reentrant-rwlock.c => rwlock.c} | 50 ++++++++++----- 7 files changed, 103 insertions(+), 87 deletions(-)
