69 lines
2.3 KiB
Plaintext
69 lines
2.3 KiB
Plaintext
From 0a6b75074845152af54f99b57543e261b18af04c Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Mon, 4 Dec 2017 16:05:26 +0300
|
|
Subject: Fix build on Haiku
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f13edb4..de9847d 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -486,7 +486,7 @@ AC_ARG_WITH(ipv6,
|
|
[ --without-ipv6 disable IPv6 support],,)
|
|
if test "x$with_ipv6" != "xno"; then
|
|
AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(IPv6,1),
|
|
- AC_CHECK_LIB(socket, getaddrinfo, AC_DEFINE(IPv6,1), [
|
|
+ AC_CHECK_LIB(network, getaddrinfo, AC_DEFINE(IPv6,1), [
|
|
AC_MSG_CHECKING([for getaddrinfo in -lws2_32])
|
|
LIBS="$LIBS -lws2_32"
|
|
AC_TRY_LINK([#include <ws2tcpip.h>], [getaddrinfo(0, 0, 0, 0);], [
|
|
@@ -537,7 +537,8 @@ if test "x$uname_s" = "xHP-UX"; then
|
|
LDFLAGS="$LDFLAGS -lsec"
|
|
fi
|
|
|
|
-AC_CHECK_FUNCS([ftime gethostbyname gethostname gettimeofday inet_ntoa memmove memset mmap mkfifo select socket strchr strcspn strdup strerror strstr])
|
|
+AC_CHECK_FUNCS([ftime gethostbyname gethostname inet_ntoa memmove memset mmap mkfifo select socket strchr strcspn strdup strerror strstr])
|
|
+AC_DEFINE([HAVE_GETTIMEOFDAY],[1],[Haiku has gettimeofday])
|
|
|
|
# check, if shmget is in cygipc.a
|
|
AC_CHECK_LIB(cygipc,shmget)
|
|
diff --git a/examples/Makefile.am b/examples/Makefile.am
|
|
index 829f735..7241db7 100644
|
|
--- a/examples/Makefile.am
|
|
+++ b/examples/Makefile.am
|
|
@@ -21,7 +21,7 @@ endif
|
|
noinst_HEADERS=radon.h rotatetemplate.c
|
|
|
|
noinst_PROGRAMS=example pnmshow regiontest pnmshow24 fontsel \
|
|
- vncev storepasswd colourmaptest simple simple15 $(MAC) \
|
|
+ storepasswd colourmaptest simple simple15 $(MAC) \
|
|
$(FILETRANSFER) backchannel $(BLOOPTEST) camera rotate \
|
|
zippy repeater
|
|
|
|
diff --git a/examples/vncev.c b/examples/vncev.c
|
|
index b185746..11f33d9 100644
|
|
--- a/examples/vncev.c
|
|
+++ b/examples/vncev.c
|
|
@@ -14,6 +14,8 @@
|
|
#include <rfb/rfb.h>
|
|
#include <rfb/default8x16.h>
|
|
|
|
+#define getpeername be_getpeername
|
|
+
|
|
#define width 100
|
|
#define height 100
|
|
static char f[width*height];
|
|
@@ -101,7 +103,8 @@ static enum rfbNewClientAction newclient(rfbClientPtr cl)
|
|
struct sockaddr_in addr;
|
|
socklen_t len=sizeof(addr);
|
|
unsigned int ip;
|
|
-
|
|
+ int getpeername(int, struct sockaddr *, int *);
|
|
+
|
|
getpeername(cl->sock,(struct sockaddr*)&addr,&len);
|
|
ip=ntohl(addr.sin_addr.s_addr);
|
|
sprintf(buffer,"Client connected from ip %d.%d.%d.%d",
|
|
--
|
|
2.15.0
|
|
|