diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-06-02 08:30:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:05 -0500 |
| commit | b25bebb960eee796d5c5b1483f20250ed286894b (patch) | |
| tree | 6a4be768f968e6bfe7df7c03639522b1273ca3a4 | |
| parent | dd11ed64aad1190b0b9467389659520c8c0f9452 (diff) | |
| download | samba-b25bebb960eee796d5c5b1483f20250ed286894b.tar.gz samba-b25bebb960eee796d5c5b1483f20250ed286894b.tar.bz2 samba-b25bebb960eee796d5c5b1483f20250ed286894b.zip | |
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
(This used to be commit 5e9b84326b4c65799e6fa6550de870d9a7ebba85)
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/include/includes.h | 3 | ||||
| -rw-r--r-- | source3/lib/replace/README | 5 | ||||
| -rw-r--r-- | source3/lib/replace/libreplace.m4 | 1 | ||||
| -rw-r--r-- | source3/lib/replace/replace.h | 4 |
5 files changed, 5 insertions, 10 deletions
diff --git a/source3/configure.in b/source3/configure.in index 63e343f43f..1c32bf6d58 100644 --- a/source3/configure.in +++ b/source3/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/source3/include/includes.h b/source3/include/includes.h index d1cd27585e..0e90004bdb 100644 --- a/source3/include/includes.h +++ b/source3/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/source3/lib/replace/README b/source3/lib/replace/README index a2f9e2fa29..77558b2ca9 100644 --- a/source3/lib/replace/README +++ b/source3/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/source3/lib/replace/libreplace.m4 b/source3/lib/replace/libreplace.m4 index a030ce2e90..e9b19b7cf5 100644 --- a/source3/lib/replace/libreplace.m4 +++ b/source3/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/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 2bda0eab52..3cb3c95b69 100644 --- a/source3/lib/replace/replace.h +++ b/source3/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); |