svn commit: samba r10466 - in branches/SAMBA_4_0/source/lib/tdb: . common

[tridge at samba.org]

Author: tridge
Date: 2005-09-24 04:56:51 +0000 (Sat, 24 Sep 2005)
New Revision: 10466

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10466

Log:
work around missing pread/pwrite declaration on openbsd

Added:
   branches/SAMBA_4_0/source/lib/tdb/aclocal.m4
Modified:
   branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h
   branches/SAMBA_4_0/source/lib/tdb/config.m4


Changeset:
Added: branches/SAMBA_4_0/source/lib/tdb/aclocal.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/aclocal.m4	2005-09-24 03:43:02 UTC (rev 10465)
+++ branches/SAMBA_4_0/source/lib/tdb/aclocal.m4	2005-09-24 04:56:51 UTC (rev 10466)
@@ -0,0 +1,12 @@
+dnl see if a declaration exists for a function or variable
+dnl defines HAVE_function_DECL if it exists
+dnl AC_HAVE_DECL(var, includes)
+AC_DEFUN(AC_HAVE_DECL,
+[
+ AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[
+    AC_TRY_COMPILE([$2],[int i = (int)$1],
+        ac_cv_have_$1_decl=yes,ac_cv_have_$1_decl=no)])
+ if test x"$ac_cv_have_$1_decl" = x"yes"; then
+    AC_DEFINE([HAVE_]translit([$1], [a-z], [A-Z])[_DECL],1,[Whether $1() is available])
+ fi
+])

Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h	2005-09-24 03:43:02 UTC (rev 10465)
+++ branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h	2005-09-24 04:56:51 UTC (rev 10466)
@@ -45,6 +45,14 @@
 #include <sys/stat.h>
 #include "config.h"
 #include "tdb.h"
+
+#ifndef HAVE_PREAD_DECL
+ssize_t pread(int fd, void *buf, size_t count, off_t offset);
+#endif
+#ifndef HAVE_PWRITE_DECL
+ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset);
+#endif
+
 #else
 #include "includes.h"
 #include "lib/tdb/include/tdb.h"

Modified: branches/SAMBA_4_0/source/lib/tdb/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/config.m4	2005-09-24 03:43:02 UTC (rev 10465)
+++ branches/SAMBA_4_0/source/lib/tdb/config.m4	2005-09-24 04:56:51 UTC (rev 10466)
@@ -1,6 +1,9 @@
 AC_CHECK_FUNCS(mmap pread pwrite)
 AC_CHECK_HEADERS(getopt.h)
 
+AC_HAVE_DECL(pread, [#include <unistd.h>])
+AC_HAVE_DECL(pwrite, [#include <unistd.h>])
+
 if test x"$experimental" = x"yes"; then
 	SMB_LIBRARY_ENABLE(libtdb,YES)
 fi