]>
Commit | Line | Data |
---|---|---|
8eca7ff5 JB |
1 | --- ctdb-2.0/ib/ibwrapper.c.orig 2012-10-31 02:33:25.000000000 +0100 |
2 | +++ ctdb-2.0/ib/ibwrapper.c 2012-12-16 16:56:36.987433136 +0100 | |
3 | @@ -34,7 +34,7 @@ | |
4 | #include <unistd.h> | |
5 | ||
6 | #include "includes.h" | |
7 | -#include "lib/events/events.h" | |
8 | +#include "tevent.h" | |
9 | #include "ibwrapper.h" | |
10 | ||
11 | #include <infiniband/kern-abi.h> | |
12 | --- ctdb-2.0/ib/ibw_ctdb_init.c.orig 2012-10-31 02:33:25.000000000 +0100 | |
13 | +++ ctdb-2.0/ib/ibw_ctdb_init.c 2012-12-16 17:00:33.467428207 +0100 | |
14 | @@ -21,6 +21,7 @@ | |
15 | */ | |
16 | ||
17 | #include "includes.h" | |
18 | +#include "lib/util/dlinklist.h" | |
19 | #include <system/network.h> | |
20 | #include <assert.h> | |
21 | #include "ctdb_private.h" | |
fc43d071 JB |
22 | --- ctdb-2.3/Makefile.in.orig 2013-07-11 07:18:06.000000000 +0200 |
23 | +++ ctdb-2.3/Makefile.in 2013-07-13 22:20:14.932379870 +0200 | |
24 | @@ -293,7 +293,7 @@ | |
8eca7ff5 JB |
25 | CTDB_TEST_C = $(CTDB_CLIENT_OBJ:.o=.c) tools/ctdb.c tools/ctdb_vacuum.c tests/src/ctdb_test.c |
26 | ||
27 | CTDB_TEST_OBJ = $(TALLOC_OBJ) $(TDB_OBJ) \ | |
b14063e3 JB |
28 | - @CTDB_SYSTEM_OBJ@ $(REPLACE_OBJ) $(EXTRA_OBJ) $(TEVENT_OBJ) $(SOCKET_WRAPPER_OBJ) |
29 | + @CTDB_SYSTEM_OBJ@ $(REPLACE_OBJ) $(EXTRA_OBJ) $(TEVENT_OBJ) $(SOCKET_WRAPPER_OBJ) @INFINIBAND_WRAPPER_OBJ@ | |
8eca7ff5 JB |
30 | |
31 | tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C) | |
32 | ||
fc43d071 | 33 | @@ -313,9 +313,9 @@ |
8eca7ff5 | 34 | @echo Linking $@ |
fc43d071 | 35 | $(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS) |
8eca7ff5 JB |
36 | |
37 | -tests/bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o | |
38 | +tests/bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o @INFINIBAND_WRAPPER_OBJ@ | |
39 | @echo Linking $@ | |
fc43d071 JB |
40 | - $(WRAPPER) $(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) |
41 | + $(WRAPPER) $(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) @INFINIBAND_WRAPPER_OBJ@ $(LIB_FLAGS) | |
8eca7ff5 JB |
42 | |
43 | manpages: | |
44 | $(MAKE) -C doc |