diff options
| author | Mathieu Parent <math.parent@gmail.com> | 2012-02-04 14:32:06 +0100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-02-11 11:15:06 +1100 |
| commit | 938bb15ad95ada9c93a3e1e9785440243d8643e5 (patch) | |
| tree | 71f1a9ab76d8c79bab6a149ee7086b7b1139e513 | |
| parent | 73f8be16c613a3767c44e29dab9b1d328a04e272 (diff) | |
| download | samba-938bb15ad95ada9c93a3e1e9785440243d8643e5.tar.gz samba-938bb15ad95ada9c93a3e1e9785440243d8643e5.tar.xz samba-938bb15ad95ada9c93a3e1e9785440243d8643e5.zip | |
Load platform dependent objs instead of Linux one
This fix compilation on Gnu/Hurd and kFreeBSD
See also:
https://buildd.debian.org/status/fetch.php?pkg=ctdb&arch=hurd-i386&ver=1.12%2Bgit20120201-1&stamp=1328211119
https://buildd.debian.org/status/fetch.php?pkg=ctdb&arch=kfreebsd-amd64&ver=1.12%2Bgit20120201-1&stamp=1328214761
https://buildd.debian.org/status/fetch.php?pkg=ctdb&arch=kfreebsd-i386&ver=1.12%2Bgit20120201-1&stamp=1328215875
(This used to be ctdb commit 496e8f8540f78606ef23ee8fa100eb2b2cf3f106)
| -rwxr-xr-x | ctdb/Makefile.in | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdb_test.c | 3 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdbd_test.c | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index 15da88398d..80008016b5 100755 --- a/ctdb/Makefile.in +++ b/ctdb/Makefile.in @@ -240,7 +240,7 @@ CTDBD_TEST_C = $(CTDB_SERVER_MOST_OBJ:.o=.c) tests/src/ctdbd_test.c CTDB_TEST_C = $(CTDB_CLIENT_OBJ:.o=.c) tools/ctdb.c tools/ctdb_vacuum.c tests/src/ctdb_test.c CTDB_TEST_OBJ = @TALLOC_OBJ@ @TDB_OBJ@ \ - @LIBREPLACEOBJ@ $(EXTRA_OBJ) @TEVENT_OBJ@ $(SOCKET_WRAPPER_OBJ) + @CTDB_SYSTEM_OBJ@ @LIBREPLACEOBJ@ $(EXTRA_OBJ) @TEVENT_OBJ@ $(SOCKET_WRAPPER_OBJ) tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C) diff --git a/ctdb/tests/src/ctdb_test.c b/ctdb/tests/src/ctdb_test.c index 83322d0ca7..0514f437cd 100644 --- a/ctdb/tests/src/ctdb_test.c +++ b/ctdb/tests/src/ctdb_test.c @@ -78,9 +78,6 @@ void tevent_loop_allow_nesting_foobar(struct tevent_context *ev); #include "common/cmdline.c" #include "lib/util/debug.c" #include "common/rb_tree.c" -#ifdef _LINUX_ERRNO_H -#include "common/system_linux.c" -#endif #include "common/system_common.c" #include "common/ctdb_logging.c" diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c index 1e72f4880f..19861ff30a 100644 --- a/ctdb/tests/src/ctdbd_test.c +++ b/ctdb/tests/src/ctdbd_test.c @@ -53,9 +53,6 @@ void ctdb_load_nodes_file(struct ctdb_context *ctdb) {} #include "common/cmdline.c" #include "lib/util/debug.c" #include "common/rb_tree.c" -#ifdef _LINUX_ERRNO_H -#include "common/system_linux.c" -#endif #include "common/system_common.c" #include "common/ctdb_logging.c" |