summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/replace/README2
-rw-r--r--lib/replace/replace.h8
-rw-r--r--source3/configure.in6
-rw-r--r--source3/include/includes.h10
-rw-r--r--source3/wscript4
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