[SCM] CTDB repository - branch master updated - ctdb-1.12-193-g496e8f8

[Ronnie Sahlberg]

The branch, master has been updated
       via  496e8f8540f78606ef23ee8fa100eb2b2cf3f106 (commit)
      from  751ed46197661eb841042ab6a02855a51dd0b17c (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 496e8f8540f78606ef23ee8fa100eb2b2cf3f106
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Feb 4 14:32:06 2012 +0100

    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

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in            |    2 +-
 tests/src/ctdb_test.c  |    3 ---
 tests/src/ctdbd_test.c |    3 ---
 3 files changed, 1 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index 15da883..8000801 100755
--- a/Makefile.in
+++ b/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/tests/src/ctdb_test.c b/tests/src/ctdb_test.c
index 83322d0..0514f43 100644
--- a/tests/src/ctdb_test.c
+++ b/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/tests/src/ctdbd_test.c b/tests/src/ctdbd_test.c
index 1e72f48..19861ff 100644
--- a/tests/src/ctdbd_test.c
+++ b/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"
 


-- 
CTDB repository