diff options
| author | Jeremy Allison <jra@samba.org> | 2012-04-11 17:50:54 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-04-12 04:28:29 +0200 |
| commit | 81d17493d6e4dc8c63d261fec36a44939db43f3c (patch) | |
| tree | 395cb0a93bf9d8af95a06430a6b94904be043b93 | |
| parent | 2216d3f08ae1d09ec10098a55b8a2f9c9fa0a5b2 (diff) | |
| download | samba-81d17493d6e4dc8c63d261fec36a44939db43f3c.tar.gz samba-81d17493d6e4dc8c63d261fec36a44939db43f3c.tar.bz2 samba-81d17493d6e4dc8c63d261fec36a44939db43f3c.zip | |
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@samba.org>
Autobuild-Date: Thu Apr 12 04:28:29 CEST 2012 on sn-devel-104
| -rw-r--r-- | lib/replace/libreplace.m4 | 14 | ||||
| -rw-r--r-- | source3/configure.in | 6 |
2 files changed, 2 insertions, 18 deletions
diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4 index df3d4c8fca..7335c98a59 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 7a704d0e92..287d20ae7a 100644 --- 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 |