sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

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

Browse Source 
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
This commit is contained in:
Jeremy Allison 2012-04-11 17:50:54 -07:00
parent 2216d3f08a
commit 81d17493d6
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/replace/libreplace.m4
View File

@ -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

6
source3/configure.in
View File

@ -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