diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-06-02 09:18:48 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-06-02 09:18:48 +1000 |
| commit | bdbf7077e857ba7cc5bc17f2f4612e70cd278a0d (patch) | |
| tree | 32463e57714c02d0ba26b61d02ac5a080d09df63 | |
| parent | 4136f2714578a9bc0e5632a21d287a50f9ec137a (diff) | |
rename ccan/typesafe_cb.h to ctdb_typesafe_cb.h and
add this file to the install/rpm
(This used to be ctdb commit 96f186240a17386de1e02eb3af392d97bb55a1ae)
| -rwxr-xr-x | ctdb/Makefile.in | 1 | ||||
| -rw-r--r-- | ctdb/include/ctdb.h | 2 | ||||
| -rw-r--r-- | ctdb/include/ctdb_typesafe_cb.h (renamed from ctdb/include/ccan/typesafe_cb.h) | 0 | ||||
| -rw-r--r-- | ctdb/packaging/RPM/ctdb.spec.in | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index 7b3c6214f6..30cbf2eacf 100755 --- a/ctdb/Makefile.in +++ b/ctdb/Makefile.in @@ -224,6 +224,7 @@ install: all ${INSTALLCMD} -m 644 include/ctdb_client.h $(DESTDIR)$(includedir) ${INSTALLCMD} -m 644 include/ctdb_protocol.h $(DESTDIR)$(includedir) ${INSTALLCMD} -m 644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3 + ${INSTALLCMD} -m 644 include/ctdb_typesafe_cb.h $(DESTDIR)$(includedir) ${INSTALLCMD} -m 644 config/functions $(DESTDIR)$(etcdir)/ctdb ${INSTALLCMD} -m 755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb ${INSTALLCMD} -m 755 config/interface_modify.sh $(DESTDIR)$(etcdir)/ctdb diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h index bd4fdc12b1..040cd0c2e4 100644 --- a/ctdb/include/ctdb.h +++ b/ctdb/include/ctdb.h @@ -211,7 +211,7 @@ int ctdb_cancel(struct ctdb_request *); /* These ugly macro wrappers make the callbacks typesafe. */ -#include <ccan/typesafe_cb.h> +#include <ctdb_typesafe_cb.h> #define ctdb_sendcb(cb, cbdata) \ typesafe_cb_preargs(void, (cb), (cbdata), \ struct ctdb_connection *, struct ctdb_request *) diff --git a/ctdb/include/ccan/typesafe_cb.h b/ctdb/include/ctdb_typesafe_cb.h index b1f2c5f5b5..b1f2c5f5b5 100644 --- a/ctdb/include/ccan/typesafe_cb.h +++ b/ctdb/include/ctdb_typesafe_cb.h diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index 738921344a..6706672cc0 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -138,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/ctdb_client.h %{_includedir}/ctdb_protocol.h %{_includedir}/ctdb_private.h +%{_includedir}/ctdb_typesafe_cb.h %{_libdir}/libctdb.a %changelog |