r23307: move readahead stuff out of libreplace and make it samba3 specific

as we can't replace this function in libreplace and we do
the some stuff for other function in the same way.

metze

diff --git a/source/configure.in b/source/configure.in
index 63e343f43f8bd4d29675686769b9a164a229aa3a..1c32bf6d58f07c58e943cd739df73afa35d053bf 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -5925,6 +5925,8 @@ if test x"$samba_cv_HAVE_LINUX_READAHEAD" = x"yes"; then
              [Whether Linux readahead is available])
 fi
 
+AC_HAVE_DECL(readahead, [#include <fcntl.h>])
+
 ############################################
 # See if we have the posix_fadvise syscall.
 

diff --git a/source/include/includes.h b/source/include/includes.h
index d1cd27585ec7d75a27de043335b5eb4724ebae0f..0e90004bdbce4d18d035d1bf74813f51786ac394 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -1214,6 +1214,9 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to);
 
 #endif /* HAVE_LDAP */
 
+#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL)
+ssize_t readahead(int fd, off64_t offset, size_t count);
+#endif
 
 /* TRUE and FALSE are part of the C99 standard and gcc, but
    unfortunately many vendor compilers don't support them.  Use True

diff --git a/source/lib/replace/README b/source/lib/replace/README
index a2f9e2fa29637870a4e7ab3681775b89cf693c2b..77558b2ca96718f95c3e58a950b0697f1c685e70 100644 (file)
--- a/source/lib/replace/README
+++ b/source/lib/replace/README
@@ -55,11 +55,6 @@ strtoull
 socketpair
 strptime
 
-These external declarations are provided for those systems which lack the
-declaration but provide the function:
-
-readahead
-
 Types:
 bool
 socklen_t

diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index a030ce2e909c2b51eb6c3ea1d53aeb27494f488e..e9b19b7cf51b45bdf38ba81941de5a8c806a346c 100644 (file)
--- a/source/lib/replace/libreplace.m4
+++ b/source/lib/replace/libreplace.m4
@@ -155,7 +155,6 @@ AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp socketpair)
 AC_HAVE_DECL(setresuid, [#include <unistd.h>])
 AC_HAVE_DECL(setresgid, [#include <unistd.h>])
 AC_HAVE_DECL(errno, [#include <errno.h>])
-AC_HAVE_DECL(readahead, [#include <fcntl.h>])
 
 AC_CACHE_CHECK([for secure mkstemp],samba_cv_HAVE_SECURE_MKSTEMP,[
 AC_TRY_RUN([#include <stdlib.h>

diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index 2bda0eab520b7549f5fbc38bf93a3450294b7a61..3cb3c95b694f016b7199b21a29a99400cdbc0f9e 100644 (file)
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -111,10 +111,6 @@ extern char *sys_errlist[];
 extern int errno;
 #endif
 
-#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL)
-ssize_t readahead(int fd, off64_t offset, size_t count);
-#endif
-
 #ifndef HAVE_STRDUP
 #define strdup rep_strdup
 char *rep_strdup(const char *s);