git.samba.org
/
sfrench
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1b7cd33
)
Revert "s3-vfs: try to fix the Tru64 build."
author
Günther Deschner
<gd@samba.org>
Thu, 21 Apr 2011 22:15:47 +0000
(
00:15
+0200)
committer
Günther Deschner
<gd@samba.org>
Thu, 21 Apr 2011 22:15:47 +0000
(
00:15
+0200)
This reverts commit
1b7cd33291ec69f58a68396cf7406a6da3083df3
.
source3/include/vfs.h
patch
|
blob
|
history
diff --git
a/source3/include/vfs.h
b/source3/include/vfs.h
index b96ab9243dff56bb65bc6ece076ab7b48ac7db15..28d6c38d1dde0fecc49b9906e91aeb968ea6c0e5 100644
(file)
--- a/
source3/include/vfs.h
+++ b/
source3/include/vfs.h
@@
-32,12
+32,6
@@
#undef vfs_ops
#endif
-/* Avoid conflict with an Tru64 include file:
- the vfsops struct on Tru64 has a vfs_init function pointer which we
- overwrite with a macro below */
-
-#undef vfsops
-
/*
* As we're now (thanks Andrew ! :-) using file_structs and connection
* structs in the vfs - then anyone writing a vfs must include includes.h...