try to fix OpenBSD build

diff --git a/configure.in b/configure.in
index 261be7445c1e20450cc78567f3fb4b94f0c2855e..0a21d50963caf3acc66be074453102bb8b5752b9 100644 (file)
--- 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 7d106c475c2cbfe4ab8244e47a96444e8718768a..bcfb5dc4d8dc31cd25d6dda622afdc0d7449c123 100644 (file)
--- 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 3fc9bb053d448c3ad22202522e5ee845c42e3837..01a2239ee3d9f6bc8cb26b6c24d44e6a3a25afef 100644 (file)
--- 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__ */