summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-09-04 20:53:58 +0000
committerJeremy Allison <jra@samba.org>1998-09-04 20:53:58 +0000
commit83900f2b682c62f2b5620b29ecb710274990ac51 (patch)
treed990ea194e1ecdb3ca78fb93f3af09274e97634d /source3/include
parent33bf29fd24c1dc076055303a0f135c9a47fb9877 (diff)
downloadsamba-83900f2b682c62f2b5620b29ecb710274990ac51.tar.gz
samba-83900f2b682c62f2b5620b29ecb710274990ac51.tar.bz2
samba-83900f2b682c62f2b5620b29ecb710274990ac51.zip
Modified dev_t and ino_t code to be 64 bit clean (including changes
to oplock break message passing). I think that smbd/nmbd are now inode and offset size independent (at least for 32 bit and 64 bit systems). Now to expose all this new functionality to NT clients..... Jeremy. (This used to be commit 5910d07bbf45a34d3c901461f74704c029a79474)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/config.h.in2
-rw-r--r--source3/include/includes.h18
2 files changed, 18 insertions, 2 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 80160fb4b4..e0bcbfe6f0 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -60,6 +60,8 @@
#undef HAVE_LONGLONG
#undef HAVE_OFF64_T
#undef SIZEOF_OFF_T
+#undef HAVE_INO64_T
+#undef SIZEOF_INO_T
#undef HAVE_REMSH
#undef HAVE_UNSIGNED_CHAR
#undef HAVE_UTIMBUF
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4086bd53fe..f0271906a5 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -322,11 +322,25 @@
*/
#ifndef SMB_DEV_T
-#define SMB_DEV_T uint32
+#define SMB_DEV_T dev_t
#endif
+/*
+ * Setup the correctly sized inode type.
+ */
+
#ifndef SMB_INO_T
-#define SMB_INO_T uint32
+# ifdef HAVE_INO64_T
+# define SMB_INO_T ino64_t
+# else
+# define SMB_INO_T ino_t
+# endif
+#endif
+
+#ifndef LARGE_SMB_INO_T
+# if defined(HAVE_INO64_T) || (defined(SIZEOF_INO_T) && (SIZEOF_INO_T == 8))
+# define LARGE_SMB_INO_T 1
+# endif
#endif
#ifndef SMB_OFF_T