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)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 15da88398d28050a0ae9d9708eb4dddf7c627d0b..80008016b5c5848461c59cede4133a8bcfd9a0aa 100755 (executable)
--- 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 83322d0ca73100d0cd23be11d6a03a7260ada250..0514f437cd498c2cf4299548e42ad1d7d67062ae 100644 (file)
--- 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 1e72f4880fdf8d40a34cc11610fcc3f216dae907..19861ff30a7f2171a08792a85235163b10a17910 100644 (file)
--- 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"