diff options
| author | Jeremy Allison <jra@samba.org> | 2012-04-09 11:04:07 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-04-09 21:40:40 +0200 |
| commit | 5701a4d8611ad1e310b76b00b146b0902c9b34ff (patch) | |
| tree | e73924791ec3c12f796836cd1827cef1561b9a97 | |
| parent | 5184f41cd8f51fd426bb6b7d6fea657df44dd8a4 (diff) | |
| download | samba-5701a4d8611ad1e310b76b00b146b0902c9b34ff.tar.gz samba-5701a4d8611ad1e310b76b00b146b0902c9b34ff.tar.bz2 samba-5701a4d8611ad1e310b76b00b146b0902c9b34ff.zip | |
Move blksize_t and blkcnt_t to replace.h from includes.h. Should help with platforms that don't have these.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Apr 9 21:40:42 CEST 2012 on sn-devel-104
| -rw-r--r-- | lib/replace/README | 2 | ||||
| -rw-r--r-- | lib/replace/replace.h | 8 | ||||
| -rw-r--r-- | source3/configure.in | 6 | ||||
| -rw-r--r-- | source3/include/includes.h | 10 | ||||
| -rw-r--r-- | source3/wscript | 4 |
5 files changed, 18 insertions, 12 deletions
diff --git a/lib/replace/README b/lib/replace/README index 787ee85812..5399971afe 100644 --- a/lib/replace/README +++ b/lib/replace/README @@ -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 diff --git a/lib/replace/replace.h b/lib/replace/replace.h index 776da8aa4a..debd4dae3c 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -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 */ diff --git a/source3/configure.in b/source3/configure.in index 98714d5dd2..bc8afc007d 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -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 diff --git a/source3/include/includes.h b/source3/include/includes.h index 7bdd20074a..88b8b4fef2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -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. */ diff --git a/source3/wscript b/source3/wscript index 28ef0d932f..3c8df0a076 100644 --- a/source3/wscript +++ b/source3/wscript @@ -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 |