summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-21 21:43:13 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-21 20:26:11 +0000
commitc529317fe2b48e045b35a613cfd1ad3f03b68435 (patch)
treee714b588b45bb825acdfa642194cd2c1e1bb441c /lib
parent5785f08268bac332d09bdf71d1907ecb54f3b5bd (diff)
downloadsamba-c529317fe2b48e045b35a613cfd1ad3f03b68435.tar.gz
samba-c529317fe2b48e045b35a613cfd1ad3f03b68435.tar.xz
samba-c529317fe2b48e045b35a613cfd1ad3f03b68435.zip
Lowercase socket_wrapper name.
Avoid linking against socket_wrapper outside of developer mode. Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Thu Oct 21 20:26:11 UTC 2010 on sn-devel-104
Diffstat (limited to 'lib')
-rw-r--r--lib/socket_wrapper/wscript2
-rw-r--r--lib/socket_wrapper/wscript_build2
-rw-r--r--lib/tdb/include/tdb.h1
-rw-r--r--lib/tdb/tdb.exports1
-rw-r--r--lib/tdb/tdb.signatures1
5 files changed, 5 insertions, 2 deletions
diff --git a/lib/socket_wrapper/wscript b/lib/socket_wrapper/wscript
index 9afd115eb2..70474d7513 100644
--- a/lib/socket_wrapper/wscript
+++ b/lib/socket_wrapper/wscript
@@ -11,5 +11,5 @@ def set_options(opt):
def configure(conf):
if (Options.options.enable_socket_wrapper or Options.options.developer or Options.options.enable_selftest):
conf.DEFINE('SOCKET_WRAPPER', 1)
- conf.ADD_GLOBAL_DEPENDENCY('SOCKET_WRAPPER')
+ conf.ADD_GLOBAL_DEPENDENCY('socket_wrapper')
diff --git a/lib/socket_wrapper/wscript_build b/lib/socket_wrapper/wscript_build
index a3546a0e22..e100ccc6fe 100644
--- a/lib/socket_wrapper/wscript_build
+++ b/lib/socket_wrapper/wscript_build
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('SOCKET_WRAPPER',
+bld.SAMBA_LIBRARY('socket_wrapper',
source='socket_wrapper.c',
group='base_libraries',
private_library=True,
diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h
index 115c6fada6..38d819733a 100644
--- a/lib/tdb/include/tdb.h
+++ b/lib/tdb/include/tdb.h
@@ -101,6 +101,7 @@ void tdb_set_max_dead(struct tdb_context *tdb, int max_dead);
int tdb_reopen(struct tdb_context *tdb);
int tdb_reopen_all(int parent_longlived);
+__attribute__((deprecated)) void tdb_logging_function(struct tdb_context *tdb, tdb_log_func);
void tdb_set_logging_function(struct tdb_context *tdb, const struct tdb_logging_context *log_ctx);
enum TDB_ERROR tdb_error(struct tdb_context *tdb);
const char *tdb_errorstr(struct tdb_context *tdb);
diff --git a/lib/tdb/tdb.exports b/lib/tdb/tdb.exports
index 73b8fd634c..09b9a96964 100644
--- a/lib/tdb/tdb.exports
+++ b/lib/tdb/tdb.exports
@@ -23,6 +23,7 @@
tdb_freelist_size;
tdb_get_flags;
tdb_get_logging_private;
+ tdb_logging_function;
tdb_get_seqnum;
tdb_hash_size;
tdb_increment_seqnum_nonblock;
diff --git a/lib/tdb/tdb.signatures b/lib/tdb/tdb.signatures
index 7706d1866a..1201077786 100644
--- a/lib/tdb/tdb.signatures
+++ b/lib/tdb/tdb.signatures
@@ -56,6 +56,7 @@ void tdb_increment_seqnum_nonblock (struct tdb_context *);
void tdb_remove_flags (struct tdb_context *, unsigned int);
void tdb_setalarm_sigptr (struct tdb_context *, volatile sig_atomic_t *);
void tdb_set_logging_function (struct tdb_context *, const struct tdb_logging_context *);
+void tdb_logging_function(struct tdb_context *tdb, tdb_log_func);
void tdb_set_max_dead (struct tdb_context *, int);
int tdb_check (struct tdb_context *, int (*) (TDB_DATA, TDB_DATA, void *), void *);
TDB_DATA tdb_null;