summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-23 13:20:45 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-09-23 14:31:01 +1000
commit08d3062fc3ece6b5d98e32bad5f1d54c088b0dd0 (patch)
treedae0aa38eae6f7c9e4717e142d54ea420c3f586c
parenta4c54f66585c6f6cf01be5e28f211176fc7d241d (diff)
downloadsamba-08d3062fc3ece6b5d98e32bad5f1d54c088b0dd0.tar.gz
samba-08d3062fc3ece6b5d98e32bad5f1d54c088b0dd0.tar.xz
samba-08d3062fc3ece6b5d98e32bad5f1d54c088b0dd0.zip
ntdb: Try to fix the build on Solaris which does not have err
-rw-r--r--lib/ccan/wscript2
-rw-r--r--lib/ntdb/wscript2
-rw-r--r--lib/replace/replace-testsuite.h13
3 files changed, 15 insertions, 2 deletions
diff --git a/lib/ccan/wscript b/lib/ccan/wscript
index be5eab23dc8..334f8fe4d08 100644
--- a/lib/ccan/wscript
+++ b/lib/ccan/wscript
@@ -147,11 +147,11 @@ def build(bld):
ccan_module(bld, 'endian')
ccan_module(bld, 'likely', 'ccan-str')
ccan_module(bld, 'typesafe_cb')
+ ccan_module(bld, 'err', 'ccan-compiler')
# Failtest pulls in a lot of stuff, and it's only for unit tests.
if bld.env.DEVELOPER_MODE:
ccan_module(bld, 'container_of', 'ccan-check_type')
- ccan_module(bld, 'err', 'ccan-compiler')
ccan_module(bld, 'htable', 'ccan-compiler')
ccan_module(bld, 'list', 'ccan-container_of')
ccan_module(bld, 'time')
diff --git a/lib/ntdb/wscript b/lib/ntdb/wscript
index 39802dbf3a3..1a4b02bb254 100644
--- a/lib/ntdb/wscript
+++ b/lib/ntdb/wscript
@@ -155,7 +155,7 @@ def build(bld):
bld.SAMBA_BINARY('ntdbtorture',
'tools/ntdbtorture.c',
- deps='ntdb',
+ deps='ntdb ccan-err',
install=False)
bld.SAMBA_BINARY('ntdbtool',
diff --git a/lib/replace/replace-testsuite.h b/lib/replace/replace-testsuite.h
new file mode 100644
index 00000000000..a522853351c
--- /dev/null
+++ b/lib/replace/replace-testsuite.h
@@ -0,0 +1,13 @@
+#ifndef __LIB_REPLACE_REPLACE_TEST_H__
+#define __LIB_REPLACE_REPLACE_TEST_H__
+
+#include <stdbool.h>
+struct torture_context;
+
+bool torture_local_replace(struct torture_context *ctx);
+int libreplace_test_strptime(void);
+int test_readdir_os2_delete(void);
+int getifaddrs_test(void);
+
+#endif /* __LIB_REPLACE_REPLACE_TEST_H__ */
+