svn commit: samba r23307 - in branches/SAMBA_3_0/source: . include lib/replace

[metze at samba.org]

Author: metze
Date: 2007-06-02 08:30:42 +0000 (Sat, 02 Jun 2007)
New Revision: 23307

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

Log:
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
Modified:
   branches/SAMBA_3_0/source/configure.in
   branches/SAMBA_3_0/source/include/includes.h
   branches/SAMBA_3_0/source/lib/replace/README
   branches/SAMBA_3_0/source/lib/replace/libreplace.m4
   branches/SAMBA_3_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2007-06-02 08:16:42 UTC (rev 23306)
+++ branches/SAMBA_3_0/source/configure.in	2007-06-02 08:30:42 UTC (rev 23307)
@@ -5925,6 +5925,8 @@
              [Whether Linux readahead is available])
 fi
 
+AC_HAVE_DECL(readahead, [#include <fcntl.h>])
+
 ############################################
 # See if we have the posix_fadvise syscall.
 

Modified: branches/SAMBA_3_0/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0/source/include/includes.h	2007-06-02 08:16:42 UTC (rev 23306)
+++ branches/SAMBA_3_0/source/include/includes.h	2007-06-02 08:30:42 UTC (rev 23307)
@@ -1214,6 +1214,9 @@
 
 #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

Modified: branches/SAMBA_3_0/source/lib/replace/README
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/README	2007-06-02 08:16:42 UTC (rev 23306)
+++ branches/SAMBA_3_0/source/lib/replace/README	2007-06-02 08:30:42 UTC (rev 23307)
@@ -55,11 +55,6 @@
 socketpair
 strptime
 
-These external declarations are provided for those systems which lack the
-declaration but provide the function:
-
-readahead
-
 Types:
 bool
 socklen_t

Modified: branches/SAMBA_3_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/libreplace.m4	2007-06-02 08:16:42 UTC (rev 23306)
+++ branches/SAMBA_3_0/source/lib/replace/libreplace.m4	2007-06-02 08:30:42 UTC (rev 23307)
@@ -155,7 +155,6 @@
 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>

Modified: branches/SAMBA_3_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/replace.h	2007-06-02 08:16:42 UTC (rev 23306)
+++ branches/SAMBA_3_0/source/lib/replace/replace.h	2007-06-02 08:30:42 UTC (rev 23307)
@@ -111,10 +111,6 @@
 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);