Remove overly complex attemt to define blkcnt_t and blksize_t. AC_CHECK_TYPE should...

Still trying to fix the buildfarm.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Apr 12 04:28:29 CEST 2012 on sn-devel-104

diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index df3d4c8fcaab2415418e7aff72195767b39340bd..7335c98a5979ea9c5919144a98cc8cc28456b4de 100644 (file)
--- 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 7a704d0e9257617e58ac3bd1413d0ebade9d9140..287d20ae7a9c850331f3529bd880f65aeae67649 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2942,9 +2942,6 @@ AC_TRY_RUN([
 #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
@@ -2959,9 +2956,6 @@ AC_TRY_RUN([
 #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