sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Move blksize_t and blkcnt_t to replace.h from includes.h. Should help with platforms that don't have these.

Browse Source 
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Apr  9 21:40:42 CEST 2012 on sn-devel-104
This commit is contained in:
Jeremy Allison 2012-04-09 11:04:07 -07:00
parent 5184f41cd8
commit 5701a4d861
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/replace/README
View File

@ -81,6 +81,8 @@ uint{8,16,32,64}_t
int{8,16,32,64}_t
intptr_t
sig_atomic_t
blksize_t
blkcnt_t
Constants:
PATH_NAME_MAX

8
lib/replace/replace.h
View File

@ -841,4 +841,12 @@ 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 */

6
source3/configure.in
View File

@ -2943,6 +2943,9 @@ AC_TRY_RUN([
#endif
#include <stdio.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,6 +2959,9 @@ AC_TRY_RUN([
#endif
#include <stdio.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

10
source3/include/includes.h
View File

@ -317,16 +317,6 @@ typedef uint64_t br_off;
#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32))
#define IVAL_TO_SMB_OFF_T(buf,off) ((off_t)(( ((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF) )))
#ifndef HAVE_BLKSIZE_T
/* This is mainly for HP/UX which defines st_blksize as long */
typedef long blksize_t;
#endif
#ifndef HAVE_BLKCNT_T
/* This is mainly for HP/UX which doesn't have blkcnt_t */
typedef long blkcnt_t;
#endif
/*
* Type for stat structure.
*/

4
source3/wscript
View File

@ -178,14 +178,14 @@ main() {
conf.CHECK_CODE('''
return sizeof(blkcnt_t) == 4 ? 0 : 1''',
'SIZEOF_BLKCNT_T_4', execute=True,
headers='sys/types.h sys/stat.h unistd.h',
headers='replace.h sys/types.h sys/stat.h unistd.h',
msg="Checking whether blkcnt_t is 32 bit")
if "HAVE_BLKCNT_T" in conf.env:
conf.CHECK_CODE('''
return sizeof(blkcnt_t) == 8 ? 0 : 1''',
'SIZEOF_BLKCNT_T_8', execute=True,
headers='sys/types.h sys/stat.h unistd.h',
headers='replace.h sys/types.h sys/stat.h unistd.h',
msg="Checking whether blkcnt_t is 64 bit")
# Check for POSIX capability support