diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-12 09:44:27 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-12 09:44:27 +1000 |
| commit | b869a525b1f40baf881a725e5632b39c99268d67 (patch) | |
| tree | 594e53b6f5ad26e28ad8fe78d9119275e4ac319d /source4/ntvfs/sysdep | |
| parent | 00ebe3df811a9eb7737fa6278d8784500c35bd14 (diff) | |
| parent | 5d02514f72c6c89bc28b4c5de3d95bb8a439b56e (diff) | |
| download | samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.gz samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.bz2 samba-b869a525b1f40baf881a725e5632b39c99268d67.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 61c31dc7cf649bc6f2d14bc8637e50ead9b9210a)
Diffstat (limited to 'source4/ntvfs/sysdep')
| -rw-r--r-- | source4/ntvfs/sysdep/config.mk | 3 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_lease.c | 5 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_notify.c | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source4/ntvfs/sysdep/config.mk b/source4/ntvfs/sysdep/config.mk index de445bff7b..68be660049 100644 --- a/source4/ntvfs/sysdep/config.mk +++ b/source4/ntvfs/sysdep/config.mk @@ -16,8 +16,7 @@ sys_notify_inotify_OBJ_FILES = ntvfs/sysdep/inotify.o sys_notify_OBJ_FILES = ntvfs/sysdep/sys_notify.o -[MODULE::sys_lease_linux] -SUBSYSTEM = sys_lease +[SUBSYSTEM::sys_lease_linux] sys_lease_linux_OBJ_FILES = ntvfs/sysdep/sys_lease_linux.o diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c index e6b11c450a..a0322bbcc1 100644 --- a/source4/ntvfs/sysdep/sys_lease.c +++ b/source4/ntvfs/sysdep/sys_lease.c @@ -28,7 +28,6 @@ #include "lib/events/events.h" #include "lib/util/dlinklist.h" #include "param/param.h" -#include "build.h" /* list of registered backends */ static struct sys_lease_ops *backends; @@ -109,6 +108,10 @@ _PUBLIC_ NTSTATUS sys_lease_register(const struct sys_lease_ops *backend) return NT_STATUS_OK; } +#ifndef STATIC_sys_lease_MODULES +#define STATIC_sys_lease_MODULES NULL +#endif + _PUBLIC_ NTSTATUS sys_lease_init(void) { static bool initialized = false; diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index 22b72c4d63..9770323c3f 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -28,7 +28,6 @@ #include "lib/events/events.h" #include "lib/util/dlinklist.h" #include "param/param.h" -#include "build.h" /* list of registered backends */ static struct sys_notify_backend *backends; |