summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-06-08 07:40:55 +0000
committerAndrew Tridgell <tridge@samba.org>2000-06-08 07:40:55 +0000
commitbda48b382477f2a6478ebd86b67cb63ac391854e (patch)
tree9ed7aca8ccb05e3dd206bb837c2164301bcfce0d /source3/include
parent6d38ba721ce57a9a574b5f0c24621df3dfcd0738 (diff)
downloadsamba-bda48b382477f2a6478ebd86b67cb63ac391854e.tar.gz
samba-bda48b382477f2a6478ebd86b67cb63ac391854e.tar.bz2
samba-bda48b382477f2a6478ebd86b67cb63ac391854e.zip
- changed HAVE_KERNEL_OPLOCKS to HAVE_KERNEL_OPLOCKS_IRIX
- added autoconf test for HAVE_KERNEL_OPLOCKS_LINUX (This used to be commit 0368f68529a9244663c199068e95d1a1d93152fa)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/config.h.in3
-rw-r--r--source3/include/smb.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index ed74b6e556..b4a4f134e4 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -142,7 +142,8 @@
#undef SIZEOF_OFF_T
#undef STAT_STATVFS64
#undef HAVE_LIBREADLINE
-#undef HAVE_KERNEL_OPLOCKS
+#undef HAVE_KERNEL_OPLOCKS_IRIX
+#undef HAVE_KERNEL_OPLOCKS_LINUX
#undef HAVE_IRIX_SPECIFIC_CAPABILITIES
#undef HAVE_INT16_FROM_RPC_RPC_H
#undef HAVE_UINT16_FROM_RPC_RPC_H
diff --git a/source3/include/smb.h b/source3/include/smb.h
index e2ce652608..0b53146259 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1624,7 +1624,7 @@ extern int chain_size;
#define KERNEL_OPLOCK_CAPABILITY 0x1
-#if defined(HAVE_KERNEL_OPLOCKS)
+#if defined(HAVE_KERNEL_OPLOCKS_IRIX)
/*
* Oplock break command code sent via the kernel interface.
*
@@ -1641,7 +1641,7 @@ extern int chain_size;
#define KERNEL_OPLOCK_BREAK_INODE_OFFSET (KERNEL_OPLOCK_BREAK_DEV_OFFSET + sizeof(SMB_DEV_T))
#define KERNEL_OPLOCK_BREAK_MSG_LEN (KERNEL_OPLOCK_BREAK_INODE_OFFSET + sizeof(SMB_INO_T))
-#endif /* HAVE_KERNEL_OPLOCKS */
+#endif /* HAVE_KERNEL_OPLOCKS_IRIX */
#define CMD_REPLY 0x8000