[patch] fix waitpid define checks

x11vnc-0.9.14-r1-waitpid.patch (text/plain), 1.44 KB, created by Paul B. Henson on 2015-12-05 23:51:07 UTC

From a6852d61dce708bf5185a7e42770475a070433bc Mon Sep 17 00:00:00 2001
From: Christian Beier <[e-mail]>
Date: Fri, 27 Nov 2015 15:57:51 +0100
Subject: [PATCH] Fix the remaining HAVE_WAITPID occurences.

---
 src/sslhelper.c | 4 ++--
 src/unixpw.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sslhelper.c b/src/sslhelper.c
index bae897f..8045d77 100644
--- a/src/sslhelper.c
+++ b/src/sslhelper.c
@@ -2964,7 +2964,7 @@ void ssl_helper_pid(pid_t pid, int sock) {
 					}
 				}
 
-#if LIBVNCSERVER_HAVE_SYS_WAIT_H && LIBVNCSERVER_HAVE_WAITPID 
+#if LIBVNCSERVER_HAVE_SYS_WAIT_H && HAVE_WAITPID
 				wret = waitpid(helpers[i], &status, WNOHANG); 
 
 if (db) fprintf(stderr, "waitpid(%d)\n", helpers[i]);
@@ -3000,7 +3000,7 @@ if (db) fprintf(stderr, "ssl_helper_pid(%d, %d)\n", pid, sock);
 	for (i=0; i < HPSIZE; i++) {
 		if (helpers[i] == pid) {
 			if (sock == -1) {
-#if LIBVNCSERVER_HAVE_SYS_WAIT_H && LIBVNCSERVER_HAVE_WAITPID 
+#if LIBVNCSERVER_HAVE_SYS_WAIT_H && HAVE_WAITPID
 				pid_t wret;
 				wret = waitpid(helpers[i], &status, WNOHANG); 
 
diff --git a/src/unixpw.c b/src/unixpw.c
index 4267b5c..3a54880 100644
--- a/src/unixpw.c
+++ b/src/unixpw.c
@@ -56,7 +56,7 @@ extern char *crypt(const char*, const char *);
 #include "default8x16.h"
 
 #if LIBVNCSERVER_HAVE_FORK
-#if LIBVNCSERVER_HAVE_SYS_WAIT_H && LIBVNCSERVER_HAVE_WAITPID
+#if LIBVNCSERVER_HAVE_SYS_WAIT_H && HAVE_WAITPID
 #define UNIXPW_SU
 #endif
 #endif