mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 13:20:08 +02:00
80 lines
2.4 KiB
Diff
80 lines
2.4 KiB
Diff
diff --git a/dist/Makefile.in b/dist/Makefile.in
|
|
index e90c0c2..60f8aef 100644
|
|
--- a/dist/Makefile.in
|
|
+++ b/dist/Makefile.in
|
|
@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
|
|
bindir= @bindir@
|
|
includedir=@includedir@
|
|
libdir= @libdir@
|
|
-docdir= $(prefix)/docs
|
|
+docdir= @docdir@
|
|
|
|
dmode= 755
|
|
emode= 555
|
|
diff --git a/dist/configure b/dist/configure
|
|
index 32b2c66..5d1ed9a 100755
|
|
--- a/dist/configure
|
|
+++ b/dist/configure
|
|
@@ -5122,6 +5122,8 @@ irix*) optimize_flag="-O2"
|
|
CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
|
|
mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
|
|
LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
|
|
+haiku*)
|
|
+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
|
|
osf*) CPPFLAGS="$CPPFLAGS -pthread";;
|
|
*qnx*) qnx_build="yes"
|
|
$as_echo "#define HAVE_QNX 1" >>confdefs.h
|
|
diff --git a/dist/configure.ac b/dist/configure.ac
|
|
index 689f3b8..d5d5125 100644
|
|
--- a/dist/configure.ac
|
|
+++ b/dist/configure.ac
|
|
@@ -206,6 +206,8 @@ irix*) optimize_flag="-O2"
|
|
CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
|
|
mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
|
|
LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
|
|
+haiku*)
|
|
+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
|
|
osf*) CPPFLAGS="$CPPFLAGS -pthread";;
|
|
*qnx*) qnx_build="yes"
|
|
AC_DEFINE(HAVE_QNX)
|
|
@@ -671,6 +673,9 @@ AC_SEARCH_LIBS(sched_yield, rt)
|
|
# The Berkeley DB library calls fdatasync, only available in -lrt on Solaris.
|
|
AC_SEARCH_LIBS(fdatasync, rt)
|
|
|
|
+# Socket only available in -lnetwork on Haiku
|
|
+AC_SEARCH_LIBS(socket, network)
|
|
+
|
|
AC_SEARCH_LIBS(getaddrinfo, nsl socket)
|
|
AC_SEARCH_LIBS(hstrerror, resolv)
|
|
|
|
diff --git a/src/repmgr/repmgr_posix.c b/src/repmgr/repmgr_posix.c
|
|
index f803863..e2b93f6 100644
|
|
--- a/src/repmgr/repmgr_posix.c
|
|
+++ b/src/repmgr/repmgr_posix.c
|
|
@@ -571,11 +571,7 @@ __repmgr_wake_main_thread(env)
|
|
* PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *));
|
|
*/
|
|
int
|
|
-__repmgr_writev(fd, iovec, buf_count, byte_count_p)
|
|
- socket_t fd;
|
|
- db_iovec_t *iovec;
|
|
- int buf_count;
|
|
- size_t *byte_count_p;
|
|
+__repmgr_writev(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
|
|
{
|
|
int nw, result;
|
|
|
|
@@ -593,11 +589,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p)
|
|
* PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *));
|
|
*/
|
|
int
|
|
-__repmgr_readv(fd, iovec, buf_count, byte_count_p)
|
|
- socket_t fd;
|
|
- db_iovec_t *iovec;
|
|
- int buf_count;
|
|
- size_t *byte_count_p;
|
|
+__repmgr_readv(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
|
|
{
|
|
int result;
|
|
ssize_t nw;
|