From 0a7b4be1736ad0e3c9f13338309a839097347ac9 Mon Sep 17 00:00:00 2001 From: bfernhomberg Date: Wed, 21 Apr 2004 18:45:40 +0000 Subject: [PATCH] try to fix OpenBSD build --- configure.in | 4 ++-- include/atalk/adouble.h | 8 ++++++-- include/atalk/util.h | 10 +++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 261be744..0a21d509 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.179.2.3.2.25 2004-04-21 00:56:58 bfernhomberg Exp $ +dnl $Id: configure.in,v 1.179.2.3.2.26 2004-04-21 18:45:40 bfernhomberg Exp $ dnl configure.in for netatalk AC_INIT(etc/afpd/main.c) @@ -148,7 +148,7 @@ case $host in esac dnl -dnl FIXME: guess this won't work on Solaris, need to check +dnl FIXME: Do we need something like this for Solaris 64bit? dnl case $host_cpu:$atalk_cv_cc_64bit_output in diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h index 7d106c47..bcfb5dc4 100644 --- a/include/atalk/adouble.h +++ b/include/atalk/adouble.h @@ -1,5 +1,5 @@ /* - * $Id: adouble.h,v 1.21.6.15 2004-03-11 19:57:32 didg Exp $ + * $Id: adouble.h,v 1.21.6.16 2004-04-21 18:45:45 bfernhomberg Exp $ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * @@ -46,7 +46,11 @@ #endif #endif -#if defined(HAVE_PREAD) && !defined(SOLARIS) +/* + Still have to figure out which platforms really + need _XOPEN_SOURCE defined for pread. + */ +#if defined(HAVE_PREAD) && !defined(SOLARIS) && !defined(__OpenBSD__) #ifdef _XOPEN_SOURCE #undef _XOPEN_SOURCE #endif diff --git a/include/atalk/util.h b/include/atalk/util.h index 3fc9bb05..01a2239e 100644 --- a/include/atalk/util.h +++ b/include/atalk/util.h @@ -1,5 +1,5 @@ /* - * $Id: util.h,v 1.7.10.4 2004-02-20 20:53:15 bfernhomberg Exp $ + * $Id: util.h,v 1.7.10.5 2004-04-21 18:45:54 bfernhomberg Exp $ */ #ifndef _ATALK_UTIL_H @@ -54,10 +54,14 @@ extern void mod_close __P((void *)); #define RTLD_NOW 1 #endif /* ! RTLD_NOW */ -/* NetBSD doesn't like RTLD_NOW for dlopen (it fails). Use RTLD_LAZY. */ +/* NetBSD doesn't like RTLD_NOW for dlopen (it fails). Use RTLD_LAZY. + * OpenBSD currently does not use the second arg for dlopen(). For + * future compatibility we define DL_LAZY */ #ifdef __NetBSD__ #define mod_open(a) dlopen(a, RTLD_LAZY) -#else /* ! __NetBSD__ */ +#elif defined(__OpenBSD__) +#define mod_open(a) dlopen(a, DL_LAZY) +#else /* ! __NetBSD__ && ! __OpenBSD__ */ #define mod_open(a) dlopen(a, RTLD_NOW) #endif /* __NetBSD__ */ -- 2.39.2