[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  81d1749 Remove overly complex attemt to define blkcnt_t and blksize_t. AC_CHECK_TYPE should just do it.
       via  2216d3f Try and fix autoconf on the build farm. Always include sys/types.h when working out sizeof(blkcnt_t).
      from  2927ca3 s3:smbd only care about missing level2 support if kernel oplocks are enabled

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 81d17493d6e4dc8c63d261fec36a44939db43f3c
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 11 17:50:54 2012 -0700

    Remove overly complex attemt to define blkcnt_t and blksize_t. AC_CHECK_TYPE should just do it.
    
    Still trying to fix the buildfarm.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Thu Apr 12 04:28:29 CEST 2012 on sn-devel-104

commit 2216d3f08ae1d09ec10098a55b8a2f9c9fa0a5b2
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Apr 11 17:10:27 2012 -0700

    Try and fix autoconf on the build farm. Always include sys/types.h when working out sizeof(blkcnt_t).

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/libreplace.m4 |   14 ++------------
 source3/configure.in      |    8 ++------
 2 files changed, 4 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index df3d4c8..7335c98 100644
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -60,18 +60,8 @@ 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_CHECK_TYPE(blksize_t,long)
+AC_CHECK_TYPE(blkcnt_t,long)
 
 AC_FUNC_MEMCMP
 
diff --git a/source3/configure.in b/source3/configure.in
index 0470a18..287d20a 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2940,10 +2940,8 @@ AC_TRY_RUN([
 #include <unistd.h>
 #endif
 #include <stdio.h>
+#include <sys/types.h>
 #include <sys/stat.h>
-#ifndef HAVE_BLKCNT_T
-typedef long blkcnt_t;
-#endif
 main() { exit((sizeof(blkcnt_t) == 4) ? 0 : 1); }],
 samba_cv_SIZEOF_BLKCNT_T_4=yes,samba_cv_SIZEOF_BLKCNT_T_4=no,samba_cv_SIZEOF_BLKCNT_T_4=cross)])
 if test x"$samba_cv_SIZEOF_BLKCNT_T_4" = x"yes"; then
@@ -2956,10 +2954,8 @@ AC_TRY_RUN([
 #include <unistd.h>
 #endif
 #include <stdio.h>
+#include <sys/types.h>
 #include <sys/stat.h>
-#ifndef HAVE_BLKCNT_T
-typedef long blkcnt_t;
-#endif
 main() { exit((sizeof(blkcnt_t) == 8) ? 0 : 1); }],
 samba_cv_SIZEOF_BLKCNT_T_8=yes,samba_cv_SIZEOF_BLKCNT_T_8=no,samba_cv_SIZEOF_BLKCNT_T_8=cross)])
 if test x"$samba_cv_SIZEOF_BLKCNT_T_8" = x"yes"; then


-- 
Samba Shared Repository