summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-09-17 23:06:57 +0000
committerJeremy Allison <jra@samba.org>1998-09-17 23:06:57 +0000
commitb8b67f4fab4a6fd686c5796c2701882197a7bd9d (patch)
tree3f465f69a283a44e5c8414a3326f53caea4664d0 /source3/include/includes.h
parentac9b687cc2496409e1c8d86393812faf94ec7550 (diff)
downloadsamba-b8b67f4fab4a6fd686c5796c2701882197a7bd9d.tar.gz
samba-b8b67f4fab4a6fd686c5796c2701882197a7bd9d.tar.bz2
samba-b8b67f4fab4a6fd686c5796c2701882197a7bd9d.zip
configure configure.in: Added checks for statvfs64. Last bit of 64 bit widening (I hope :-).
include/config.h.in: Added #undef STAT_STATVFS64. include/includes.h: Added SMB_STRUCT_STATVFS type, Changed SMB_BIG_INTEGER to SMB_BIG_UINT and SMB_BIG_INT types. include/smb.h: Added flag defines from CIFS spec. lib/debug.c: Fixed one more mode_t issue. lib/system.c: Added sys_statvfs wrapper. lib/util.c: Changed trim_string to use size_t. param/loadparm.c: Moved "blocking locks" into locking section. Alphabetised locking options. Question - shuld we do this for all options ? passdb/ldap.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT. passdb/nispass.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT. passdb/smbpass.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT. smbd/dfree.c: Changed to use 64 bit types if available. Moved to use unsigned types. smbd/dosmode.c: Fixed one more mode_t issue. smbd/negprot.c: Changed literals to be FLAG_ #defines. smbd/nttrans.c: Removed dead code. smbd/open.c: Changed disk_free call. smbd/process.c: Changed literals to be FLAG_ #defines. smbd/reply.c: Changed disk_free call. smbd/trans2.c: Fixed but in SMB_QUERY_FS_VOLUME_INFO call. Was using UNICODE - should use ascii. tests/summary.c: Added STAT_STATVFS64 check. Jeremy. (This used to be commit c512b1b91fb7f2a7a93b9033a33e06d966daadb4)
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r--source3/include/includes.h18
1 files changed, 16 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index d8da84bd4e..788e4485ab 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -375,6 +375,18 @@
#endif
/*
+ * Type for statvfs structure.
+ */
+
+#ifndef SMB_STRUCT_STATVFS
+# if defined(STAT_STATVFS64)
+# define SMB_STRUCT_STATVFS struct statvfs64
+# else
+# define SMB_STRUCT_STATVFS struct statvfs
+# endif
+#endif
+
+/*
* Defines for 64 bit fcntl locks.
*/
@@ -411,9 +423,11 @@
#endif
#if defined(HAVE_LONGLONG)
-#define SMB_BIG_INTEGER unsigned long long
+#define SMB_BIG_UINT unsigned long long
+#define SMB_BIG_INT long long
#else
-#define SMB_BIG_INTEGER unsigned long
+#define SMB_BIG_UINT unsigned long
+#define SMB_BIG_INT long
#endif
#ifndef MIN