On advice from Jelmer and Andrew, move the blksize_t and blkcnt_t tests into librepla...

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Apr 10 04:07:11 CEST 2012 on sn-devel-104

diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 72de91799c280b47697e18f58a0b5dabbf8b4c79..df3d4c8fcaab2415418e7aff72195767b39340bd 100644 (file)
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -60,6 +60,18 @@ AC_STRUCT_ST_RDEV
 AC_CHECK_TYPE(ino_t,unsigned)
 AC_CHECK_TYPE(loff_t,off_t)
 AC_CHECK_TYPE(offset_t,loff_t)
+AC_CHECK_TYPE([blksize_t],,
+                [AC_DEFINE_UNQUOTED([blksize_t], [long],
+                                    [Define to `long' if
+                                     <sys/stat.h> does not define it.])],
+               [],
+               [[#include <sys/stat.h>]])
+AC_CHECK_TYPE([blkcnt_t],,
+                [AC_DEFINE_UNQUOTED([blkcnt_t], [long],
+                                    [Define to `long' if
+                                     <sys/stat.h> does not define it.])],
+               [],
+               [[#include <sys/stat.h>]])
 
 AC_FUNC_MEMCMP
 

diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index debd4dae3c22856e290b9adeea8817b4239ca25d..776da8aa4a13d97cf64d044ef942802c50de1ed4 100644 (file)
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -841,12 +841,4 @@ typedef long useconds_t;
 int usleep(useconds_t);
 #endif
 
-#ifndef HAVE_BLKSIZE_T
-typedef long blksize_t;
-#endif
-
-#ifndef HAVE_BLKCNT_T
-typedef long blkcnt_t;
-#endif
-
 #endif /* _LIBREPLACE_REPLACE_H */

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 025dda460db2d9ebd1fe3570b92a11afa806e7c6..d7b0634f3f2cd290e6c9cadd2b7d44ad1683a23b 100644 (file)
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -91,6 +91,8 @@ def configure(conf):
     conf.CHECK_TYPE('offset_t', 'loff_t')
     conf.CHECK_TYPE('volatile int', define='HAVE_VOLATILE')
     conf.CHECK_TYPE('uint_t', 'unsigned int')
+    conf.CHECK_TYPE('blksize_t', 'long', headers='sys/types.h sys/stat.h unistd.h')
+    conf.CHECK_TYPE('blkcnt_t', 'long', headers='sys/types.h sys/stat.h unistd.h')
 
     conf.CHECK_SIZEOF('bool char int "long long" long short size_t ssize_t')
     conf.CHECK_SIZEOF('int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t')

diff --git a/source3/configure.in b/source3/configure.in
index bc8afc007dd359f306cd6ef1dd3602c76ebf95e9..bf777a16f50c7e168f4e49f9be9aa31233cf657a 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2934,8 +2934,6 @@ if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
     AC_DEFINE(HAVE_STAT_ST_BLOCKS,1,[Whether the stat struct has a st_block property])
 fi
 
-AC_CHECK_TYPES([blksize_t, blkcnt_t], [], [], [[#include <sys/stat.h>]])
-
 AC_CACHE_CHECK([for 32 bit blkcnt_t],samba_cv_SIZEOF_BLKCNT_T_4,[
 AC_TRY_RUN([
 #if defined(HAVE_UNISTD_H)

diff --git a/source3/wscript b/source3/wscript
index 3c8df0a0769bb5c3d165e339712eb6ac515f3c45..24924cca009e73f29ef842af919d81dc56cdee3e 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -166,7 +166,6 @@ main() {
         msg="Checking for krenel share modes")
 
     # Check for various members of the stat structure
-    conf.CHECK_TYPES('blksize_t blkcnt_t')
     conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blocks', define='HAVE_STAT_ST_BLOCKS',
                                 headers='sys/stat.h')
     conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blksize', define='HAVE_STAT_ST_BLKSIZE',