diff options
author | Robert Ginda <rginda@chromium.org> | 2015-08-04 15:24:15 -0700 |
---|---|---|
committer | Robert Ginda <rginda@chromium.org> | 2015-08-11 11:16:45 -0700 |
commit | 8e46e738cae449bf44232c66e973c8e9e15fbcb5 (patch) | |
tree | 79c6f758aaa9ae4de20ea966235f0c0272c88a4f | |
parent | 57cc59c1868f186da5b9dc3fc63dbab3fe2ce54c (diff) | |
download | avahi-8e46e738cae449bf44232c66e973c8e9e15fbcb5.tar.gz |
rename avahi-common/malloc.[ch] to avahi-malloc.
This is to avoid clashing with the system malloc.h, which occurs
in an android build beacause of the order of the generated includes.
This change was generated with the script:
cat > rename_malloc.sh <<EOF
replace() {
local search="$1"
local replace="$2"
FILES=$(grep -l "$search" $(find . -name '*.[ch]'))
for file in $FILES; do
echo $file
sed "s|$search|$replace|" < $file > sed.tmp
mv sed.tmp $file
done
}
replace "include \"malloc.h\"" "include \"avahi-malloc.h\""
replace "include \"avahi-common/malloc.h\"" \
"include \"avahi-common/avahi-malloc.h\""
replace "include <avahi-common/malloc.h>" \
"include \"avahi-common/avahi-malloc.h\""
EOF
Bug: 22827641
Change-Id: I1eeb4a57993650d8aae62f0686942cfac367b9a8
102 files changed, 106 insertions, 106 deletions
diff --git a/Makefile.am b/Makefile.am index 8234d69..d64fc76 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,7 +80,7 @@ SUBDIRS = \ DX_INPUT = \ $(srcdir)/avahi-common/address.h \ - $(srcdir)/avahi-common/malloc.h \ + $(srcdir)/avahi-common/avahi-malloc.h \ $(srcdir)/avahi-common/strlst.h \ $(srcdir)/avahi-common/alternative.h \ $(srcdir)/avahi-common/defs.h \ diff --git a/avahi-autoipd/Makefile.am b/avahi-autoipd/Makefile.am index 56f7a35..d7c857b 100644 --- a/avahi-autoipd/Makefile.am +++ b/avahi-autoipd/Makefile.am @@ -35,7 +35,7 @@ avahi_autoipd_SOURCES = \ main.c main.h \ ../avahi-daemon/setproctitle.c ../avahi-daemon/setproctitle.h \ iface.h \ - ../avahi-common/malloc.h ../avahi-common/malloc.c \ + ../avahi-common/avahi-malloc.h ../avahi-common/avahi-malloc.c \ ../avahi-common/timeval.h ../avahi-common/timeval.c avahi_autoipd_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS) diff --git a/avahi-autoipd/iface-bsd.c b/avahi-autoipd/iface-bsd.c index 6a1085c..1773c06 100644 --- a/avahi-autoipd/iface-bsd.c +++ b/avahi-autoipd/iface-bsd.c @@ -46,7 +46,7 @@ #include <libdaemon/dlog.h> #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "iface.h" diff --git a/avahi-autoipd/iface-linux.c b/avahi-autoipd/iface-linux.c index 83e9e41..1d16024 100644 --- a/avahi-autoipd/iface-linux.c +++ b/avahi-autoipd/iface-linux.c @@ -36,7 +36,7 @@ #include <libdaemon/dlog.h> #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #ifndef IFLA_RTA #include <linux/if_addr.h> diff --git a/avahi-autoipd/main.c b/avahi-autoipd/main.c index a1bddb2..af65e95 100644 --- a/avahi-autoipd/main.c +++ b/avahi-autoipd/main.c @@ -68,7 +68,7 @@ #endif -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/timeval.h> #include <avahi-daemon/setproctitle.h> diff --git a/avahi-client/browser.c b/avahi-client/browser.c index c978d94..faaf976 100644 --- a/avahi-client/browser.c +++ b/avahi-client/browser.c @@ -31,7 +31,7 @@ #include <avahi-common/dbus.h> #include <avahi-common/llist.h> #include <avahi-common/error.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/domain.h> #include "client.h" diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c index 7d04a6a..5a6bb72 100644 --- a/avahi-client/client-test.c +++ b/avahi-client/client-test.c @@ -30,7 +30,7 @@ #include <avahi-common/error.h> #include <avahi-common/simple-watch.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/timeval.h> static const AvahiPoll *poll_api = NULL; diff --git a/avahi-client/client.c b/avahi-client/client.c index 70cc35d..d91c181 100644 --- a/avahi-client/client.c +++ b/avahi-client/client.c @@ -31,7 +31,7 @@ #include <avahi-common/llist.h> #include <avahi-common/error.h> #include <avahi-common/dbus.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus-watch-glue.h> #include <avahi-common/i18n.h> diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c index d809d60..4207494 100644 --- a/avahi-client/entrygroup.c +++ b/avahi-client/entrygroup.c @@ -31,7 +31,7 @@ #include <avahi-common/dbus.h> #include <avahi-common/llist.h> #include <avahi-common/error.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "client.h" #include "internal.h" diff --git a/avahi-client/resolver.c b/avahi-client/resolver.c index 6ee15e9..bdb4d12 100644 --- a/avahi-client/resolver.c +++ b/avahi-client/resolver.c @@ -31,7 +31,7 @@ #include <avahi-common/dbus.h> #include <avahi-common/llist.h> #include <avahi-common/error.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "client.h" #include "internal.h" diff --git a/avahi-client/rr-test.c b/avahi-client/rr-test.c index 0402585..d1884f1 100644 --- a/avahi-client/rr-test.c +++ b/avahi-client/rr-test.c @@ -28,7 +28,7 @@ #include <avahi-client/lookup.h> #include <avahi-common/error.h> #include <avahi-common/simple-watch.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" static void hexdump(const void* p, size_t size) { const uint8_t *c = p; diff --git a/avahi-client/srv-test.c b/avahi-client/srv-test.c index 650bd77..3d606a2 100644 --- a/avahi-client/srv-test.c +++ b/avahi-client/srv-test.c @@ -28,7 +28,7 @@ #include <avahi-client/lookup.h> #include <avahi-common/error.h> #include <avahi-common/simple-watch.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" static void callback( AVAHI_GCC_UNUSED AvahiServiceResolver *r, diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am index 3118b0b..52c0c22 100644 --- a/avahi-common/Makefile.am +++ b/avahi-common/Makefile.am @@ -29,7 +29,7 @@ avahi_commoninclude_HEADERS = \ domain.h \ cdecl.h \ defs.h \ - malloc.h \ + avahi-malloc.h \ watch.h \ timeval.h \ simple-watch.h \ @@ -54,7 +54,7 @@ lib_LTLIBRARIES = \ libavahi-common.la libavahi_common_la_SOURCES = \ - malloc.c malloc.h \ + avahi-malloc.c avahi-malloc.h \ address.c address.h \ alternative.c alternative.h \ error.c error.h \ @@ -74,13 +74,13 @@ libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_COMMON_VERS strlst_test_SOURCES = \ strlst.c strlst.h \ - malloc.c malloc.h \ + avahi-malloc.c avahi-malloc.h \ strlst-test.c strlst_test_CFLAGS = $(AM_CFLAGS) alternative_test_SOURCES = \ alternative.c alternative.h \ - malloc.c malloc.h \ + avahi-malloc.c avahi-malloc.h \ domain.c domain.h \ address.c address.h \ alternative-test.c \ @@ -89,7 +89,7 @@ alternative_test_CFLAGS = $(AM_CFLAGS) domain_test_SOURCES = \ domain.c domain.h \ - malloc.c malloc.h \ + avahi-malloc.c avahi-malloc.h \ address.c address.h \ domain-test.c \ utf8.c utf8.h @@ -99,7 +99,7 @@ watch_test_SOURCES = \ timeval.c timeval.h \ simple-watch.c simple-watch.h \ watch.h \ - malloc.c malloc.h \ + avahi-malloc.c avahi-malloc.h \ watch-test.c watch_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) watch_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) diff --git a/avahi-common/address.c b/avahi-common/address.c index e8f6148..0973cc1 100644 --- a/avahi-common/address.c +++ b/avahi-common/address.c @@ -30,7 +30,7 @@ #include <stdio.h> #include "address.h" -#include "malloc.h" +#include "avahi-malloc.h" static size_t address_get_size(const AvahiAddress *a) { assert(a); diff --git a/avahi-common/alternative-test.c b/avahi-common/alternative-test.c index 9255435..5fb4bce 100644 --- a/avahi-common/alternative-test.c +++ b/avahi-common/alternative-test.c @@ -24,7 +24,7 @@ #include <stdio.h> #include "alternative.h" -#include "malloc.h" +#include "avahi-malloc.h" #include "domain.h" int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c index b3d39f0..454622f 100644 --- a/avahi-common/alternative.c +++ b/avahi-common/alternative.c @@ -27,7 +27,7 @@ #include <assert.h> #include "alternative.h" -#include "malloc.h" +#include "avahi-malloc.h" #include "domain.h" #include "utf8.h" diff --git a/avahi-common/malloc.c b/avahi-common/avahi-malloc.c index 23b13a9..2d0ca33 100644 --- a/avahi-common/malloc.c +++ b/avahi-common/avahi-malloc.c @@ -27,7 +27,7 @@ #include <stdio.h> #include <unistd.h> -#include "malloc.h" +#include "avahi-malloc.h" #ifndef va_copy #ifdef __va_copy diff --git a/avahi-common/malloc.h b/avahi-common/avahi-malloc.h index ffaac3f..ffaac3f 100644 --- a/avahi-common/malloc.h +++ b/avahi-common/avahi-malloc.h diff --git a/avahi-common/dbus-watch-glue.c b/avahi-common/dbus-watch-glue.c index b18f555..da5c30c 100644 --- a/avahi-common/dbus-watch-glue.c +++ b/avahi-common/dbus-watch-glue.c @@ -24,7 +24,7 @@ #include <assert.h> #include <stdio.h> -#include "malloc.h" +#include "avahi-malloc.h" #include "timeval.h" #include "dbus-watch-glue.h" diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c index cf763ec..ecee697 100644 --- a/avahi-common/domain-test.c +++ b/avahi-common/domain-test.c @@ -26,7 +26,7 @@ #include <assert.h> #include "domain.h" -#include "malloc.h" +#include "avahi-malloc.h" int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { char *s; diff --git a/avahi-common/domain.c b/avahi-common/domain.c index 3b1ab68..d4d6143 100644 --- a/avahi-common/domain.c +++ b/avahi-common/domain.c @@ -32,7 +32,7 @@ #include <assert.h> #include "domain.h" -#include "malloc.h" +#include "avahi-malloc.h" #include "error.h" #include "address.h" #include "utf8.h" diff --git a/avahi-common/rlist.c b/avahi-common/rlist.c index 17dcb24..409846c 100644 --- a/avahi-common/rlist.c +++ b/avahi-common/rlist.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include "rlist.h" -#include "malloc.h" +#include "avahi-malloc.h" AvahiRList* avahi_rlist_prepend(AvahiRList *r, void *data) { AvahiRList *n; diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c index 8df18dd..f8b5948 100644 --- a/avahi-common/simple-watch.c +++ b/avahi-common/simple-watch.c @@ -30,7 +30,7 @@ #include <stdio.h> #include "llist.h" -#include "malloc.h" +#include "avahi-malloc.h" #include "timeval.h" #include "simple-watch.h" diff --git a/avahi-common/strlst-test.c b/avahi-common/strlst-test.c index 0945b37..d265d4f 100644 --- a/avahi-common/strlst-test.c +++ b/avahi-common/strlst-test.c @@ -25,7 +25,7 @@ #include <assert.h> #include "strlst.h" -#include "malloc.h" +#include "avahi-malloc.h" int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { char *t, *v; diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c index b861cf8..e495634 100644 --- a/avahi-common/strlst.c +++ b/avahi-common/strlst.c @@ -28,7 +28,7 @@ #include <stdlib.h> #include "strlst.h" -#include "malloc.h" +#include "avahi-malloc.h" #include "defs.h" AvahiStringList*avahi_string_list_add_anonymous(AvahiStringList *l, size_t size) { diff --git a/avahi-common/thread-watch.c b/avahi-common/thread-watch.c index c0cadeb..3eabb15 100644 --- a/avahi-common/thread-watch.c +++ b/avahi-common/thread-watch.c @@ -32,7 +32,7 @@ #include <signal.h> #include "llist.h" -#include "malloc.h" +#include "avahi-malloc.h" #include "timeval.h" #include "simple-watch.h" #include "thread-watch.h" diff --git a/avahi-compat-howl/compat.c b/avahi-compat-howl/compat.c index 9b8b18c..3207763 100644 --- a/avahi-compat-howl/compat.c +++ b/avahi-compat-howl/compat.c @@ -26,7 +26,7 @@ #include <pthread.h> #include <avahi-common/strlst.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/domain.h> #include <avahi-common/simple-watch.h> #include <avahi-common/error.h> diff --git a/avahi-compat-howl/text.c b/avahi-compat-howl/text.c index 7ef4df3..df625ce 100644 --- a/avahi-compat-howl/text.c +++ b/avahi-compat-howl/text.c @@ -24,7 +24,7 @@ #include <assert.h> #include <avahi-common/strlst.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/domain.h> #include "howl.h" diff --git a/avahi-compat-libdns_sd/compat.c b/avahi-compat-libdns_sd/compat.c index 3ea359e..8b95fd9 100644 --- a/avahi-compat-libdns_sd/compat.c +++ b/avahi-compat-libdns_sd/compat.c @@ -35,7 +35,7 @@ #include <sys/socket.h> #include <avahi-common/simple-watch.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include <avahi-common/domain.h> #include <avahi-common/alternative.h> diff --git a/avahi-compat-libdns_sd/txt.c b/avahi-compat-libdns_sd/txt.c index 9d6c116..348dfc3 100644 --- a/avahi-compat-libdns_sd/txt.c +++ b/avahi-compat-libdns_sd/txt.c @@ -26,7 +26,7 @@ #include <assert.h> #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "dns_sd.h" #include "warn.h" diff --git a/avahi-core/announce.c b/avahi-core/announce.c index ccdbf15..7fd1311 100644 --- a/avahi-core/announce.c +++ b/avahi-core/announce.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "announce.h" #include "log.h" diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c index 8b2376f..a54d85d 100644 --- a/avahi-core/avahi-test.c +++ b/avahi-core/avahi-test.c @@ -30,7 +30,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/simple-watch.h> #include <avahi-common/alternative.h> #include <avahi-common/timeval.h> diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c index a51c38f..d117b0b 100644 --- a/avahi-core/browse-dns-server.c +++ b/avahi-core/browse-dns-server.c @@ -24,7 +24,7 @@ #include <string.h> #include <avahi-common/domain.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include "browse.h" diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c index 9705b2a..bd826f6 100644 --- a/avahi-core/browse-domain.c +++ b/avahi-core/browse-domain.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <avahi-common/domain.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include "browse.h" diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c index 6fff071..ac3ee7d 100644 --- a/avahi-core/browse-service-type.c +++ b/avahi-core/browse-service-type.c @@ -24,7 +24,7 @@ #include <string.h> #include <avahi-common/domain.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include "browse.h" diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c index dde36bc..7860ec5 100644 --- a/avahi-core/browse-service.c +++ b/avahi-core/browse-service.c @@ -24,7 +24,7 @@ #include <string.h> #include <avahi-common/domain.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include "browse.h" diff --git a/avahi-core/browse.c b/avahi-core/browse.c index eabd7ea..2e9a965 100644 --- a/avahi-core/browse.c +++ b/avahi-core/browse.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include <avahi-common/domain.h> #include <avahi-common/rlist.h> diff --git a/avahi-core/cache.c b/avahi-core/cache.c index 454aac5..c7059df 100644 --- a/avahi-core/cache.c +++ b/avahi-core/cache.c @@ -26,7 +26,7 @@ #include <time.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "cache.h" #include "log.h" diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c index 632f66b..33001a4 100644 --- a/avahi-core/conformance-test.c +++ b/avahi-core/conformance-test.c @@ -32,7 +32,7 @@ #include <arpa/inet.h> #include <avahi-common/alternative.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/simple-watch.h> #include <avahi-common/timeval.h> diff --git a/avahi-core/dns-test.c b/avahi-core/dns-test.c index ebe2305..c9d1b75 100644 --- a/avahi-core/dns-test.c +++ b/avahi-core/dns-test.c @@ -29,7 +29,7 @@ #include <avahi-common/domain.h> #include <avahi-common/defs.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "dns.h" #include "log.h" diff --git a/avahi-core/dns.c b/avahi-core/dns.c index 2fcd91f..da7b600 100644 --- a/avahi-core/dns.c +++ b/avahi-core/dns.c @@ -31,7 +31,7 @@ #include <avahi-common/defs.h> #include <avahi-common/domain.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "dns.h" #include "log.h" diff --git a/avahi-core/domain-util.c b/avahi-core/domain-util.c index 6eed27f..df8d891 100644 --- a/avahi-core/domain-util.c +++ b/avahi-core/domain-util.c @@ -29,7 +29,7 @@ #include <sys/utsname.h> #include <stdio.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "log.h" #include "domain-util.h" diff --git a/avahi-core/entry.c b/avahi-core/entry.c index 0d86213..85c72a8 100644 --- a/avahi-core/entry.c +++ b/avahi-core/entry.c @@ -36,7 +36,7 @@ #include <avahi-common/domain.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include <avahi-common/domain.h> diff --git a/avahi-core/hashmap-test.c b/avahi-core/hashmap-test.c index 209d0e5..5938ae4 100644 --- a/avahi-core/hashmap-test.c +++ b/avahi-core/hashmap-test.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <avahi-common/domain.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "hashmap.h" #include "util.h" diff --git a/avahi-core/hashmap.c b/avahi-core/hashmap.c index 9b55bd3..58e9b4a 100644 --- a/avahi-core/hashmap.c +++ b/avahi-core/hashmap.c @@ -26,7 +26,7 @@ #include <avahi-common/llist.h> #include <avahi-common/domain.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "hashmap.h" #include "util.h" diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c index da497bc..1a4fb2c 100644 --- a/avahi-core/iface-linux.c +++ b/avahi-core/iface-linux.c @@ -26,7 +26,7 @@ #include <errno.h> #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "log.h" #include "iface.h" diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c index 9a2e953..d708e3d 100644 --- a/avahi-core/iface-pfroute.c +++ b/avahi-core/iface-pfroute.c @@ -21,7 +21,7 @@ #include <config.h> #endif -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <string.h> #include <unistd.h> diff --git a/avahi-core/iface.c b/avahi-core/iface.c index 39a860a..5a171b1 100644 --- a/avahi-core/iface.c +++ b/avahi-core/iface.c @@ -30,7 +30,7 @@ #include <netinet/in.h> #include <avahi-common/error.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/domain.h> #include "iface.h" diff --git a/avahi-core/multicast-lookup.c b/avahi-core/multicast-lookup.c index 75988bf..c9feee2 100644 --- a/avahi-core/multicast-lookup.c +++ b/avahi-core/multicast-lookup.c @@ -23,7 +23,7 @@ #include <stdlib.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/timeval.h> #include "internal.h" diff --git a/avahi-core/netlink.c b/avahi-core/netlink.c index 4ded5ec..60d0af3 100644 --- a/avahi-core/netlink.c +++ b/avahi-core/netlink.c @@ -27,7 +27,7 @@ #include <sys/ioctl.h> #include <assert.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "netlink.h" #include "log.h" diff --git a/avahi-core/prioq.c b/avahi-core/prioq.c index 28b5018..ef515e0 100644 --- a/avahi-core/prioq.c +++ b/avahi-core/prioq.c @@ -24,7 +24,7 @@ #include <assert.h> #include <stdlib.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "prioq.h" diff --git a/avahi-core/probe-sched.c b/avahi-core/probe-sched.c index 1e63411..0392f91 100644 --- a/avahi-core/probe-sched.c +++ b/avahi-core/probe-sched.c @@ -25,7 +25,7 @@ #include <avahi-common/domain.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "probe-sched.h" #include "log.h" diff --git a/avahi-core/querier-test.c b/avahi-core/querier-test.c index e1ce913..fb98158 100644 --- a/avahi-core/querier-test.c +++ b/avahi-core/querier-test.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <assert.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/simple-watch.h> #include <avahi-common/alternative.h> #include <avahi-common/timeval.h> diff --git a/avahi-core/querier.c b/avahi-core/querier.c index d9dc1fb..36eb230 100644 --- a/avahi-core/querier.c +++ b/avahi-core/querier.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include <avahi-common/domain.h> diff --git a/avahi-core/query-sched.c b/avahi-core/query-sched.c index ff833f9..cdfbbdd 100644 --- a/avahi-core/query-sched.c +++ b/avahi-core/query-sched.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "query-sched.h" #include "log.h" diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c index dd4adbc..c6abfc4 100644 --- a/avahi-core/resolve-address.c +++ b/avahi-core/resolve-address.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include <avahi-common/domain.h> diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c index 08f209b..cefbf21 100644 --- a/avahi-core/resolve-host-name.c +++ b/avahi-core/resolve-host-name.c @@ -25,7 +25,7 @@ #include <avahi-common/domain.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include "browse.h" diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c index 3377a50..2784ddf 100644 --- a/avahi-core/resolve-service.c +++ b/avahi-core/resolve-service.c @@ -27,7 +27,7 @@ #include <avahi-common/domain.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include "browse.h" diff --git a/avahi-core/response-sched.c b/avahi-core/response-sched.c index abac0a1..40fbd89 100644 --- a/avahi-core/response-sched.c +++ b/avahi-core/response-sched.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "response-sched.h" #include "log.h" diff --git a/avahi-core/rr.c b/avahi-core/rr.c index 7fa0bee..a64ea55 100644 --- a/avahi-core/rr.c +++ b/avahi-core/rr.c @@ -29,7 +29,7 @@ #include <assert.h> #include <avahi-common/domain.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/defs.h> #include "rr.h" diff --git a/avahi-core/rrlist.c b/avahi-core/rrlist.c index 0a794ab..10413ec 100644 --- a/avahi-core/rrlist.c +++ b/avahi-core/rrlist.c @@ -25,7 +25,7 @@ #include <assert.h> #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "rrlist.h" #include "log.h" diff --git a/avahi-core/server.c b/avahi-core/server.c index 69a1d02..5b22ea8 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -35,7 +35,7 @@ #include <avahi-common/domain.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include "internal.h" diff --git a/avahi-core/timeeventq.c b/avahi-core/timeeventq.c index 2799bf2..8a56ab0 100644 --- a/avahi-core/timeeventq.c +++ b/avahi-core/timeeventq.c @@ -25,7 +25,7 @@ #include <stdlib.h> #include <avahi-common/timeval.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "timeeventq.h" #include "log.h" diff --git a/avahi-core/update-test.c b/avahi-core/update-test.c index feb884a..47ebbf1 100644 --- a/avahi-core/update-test.c +++ b/avahi-core/update-test.c @@ -27,7 +27,7 @@ #include <avahi-common/error.h> #include <avahi-common/watch.h> #include <avahi-common/simple-watch.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/alternative.h> #include <avahi-common/timeval.h> diff --git a/avahi-core/util.c b/avahi-core/util.c index 21ef94c..c68d9a3 100644 --- a/avahi-core/util.c +++ b/avahi-core/util.c @@ -27,7 +27,7 @@ #include <assert.h> #include <ctype.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "util.h" void avahi_hexdump(const void* p, size_t size) { diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c index d5e64e5..92ef58c 100644 --- a/avahi-core/wide-area.c +++ b/avahi-core/wide-area.c @@ -27,7 +27,7 @@ #include <stdlib.h> #include <netinet/in.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include <avahi-common/timeval.h> diff --git a/avahi-daemon/dbus-async-address-resolver.c b/avahi-daemon/dbus-async-address-resolver.c index a77e03c..7940b03 100644 --- a/avahi-daemon/dbus-async-address-resolver.c +++ b/avahi-daemon/dbus-async-address-resolver.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-async-host-name-resolver.c b/avahi-daemon/dbus-async-host-name-resolver.c index 7c2d063..325abe1 100644 --- a/avahi-daemon/dbus-async-host-name-resolver.c +++ b/avahi-daemon/dbus-async-host-name-resolver.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-async-service-resolver.c b/avahi-daemon/dbus-async-service-resolver.c index 2b58e2d..0514b20 100644 --- a/avahi-daemon/dbus-async-service-resolver.c +++ b/avahi-daemon/dbus-async-service-resolver.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-domain-browser.c b/avahi-daemon/dbus-domain-browser.c index e51996f..9889a3f 100644 --- a/avahi-daemon/dbus-domain-browser.c +++ b/avahi-daemon/dbus-domain-browser.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c index 4e879a5..421f552 100644 --- a/avahi-daemon/dbus-entry-group.c +++ b/avahi-daemon/dbus-entry-group.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-common/domain.h> diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c index eb8a662..3deb9d4 100644 --- a/avahi-daemon/dbus-protocol.c +++ b/avahi-daemon/dbus-protocol.c @@ -40,7 +40,7 @@ #include <avahi-common/dbus.h> #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus-watch-glue.h> #include <avahi-common/alternative.h> #include <avahi-common/error.h> diff --git a/avahi-daemon/dbus-record-browser.c b/avahi-daemon/dbus-record-browser.c index c0337cf..a8a2746 100644 --- a/avahi-daemon/dbus-record-browser.c +++ b/avahi-daemon/dbus-record-browser.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-service-browser.c b/avahi-daemon/dbus-service-browser.c index 962dca0..2f987b4 100644 --- a/avahi-daemon/dbus-service-browser.c +++ b/avahi-daemon/dbus-service-browser.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-service-type-browser.c b/avahi-daemon/dbus-service-type-browser.c index 20afdbe..f464b8b 100644 --- a/avahi-daemon/dbus-service-type-browser.c +++ b/avahi-daemon/dbus-service-type-browser.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-sync-address-resolver.c b/avahi-daemon/dbus-sync-address-resolver.c index 9845420..12c7989 100644 --- a/avahi-daemon/dbus-sync-address-resolver.c +++ b/avahi-daemon/dbus-sync-address-resolver.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-sync-host-name-resolver.c b/avahi-daemon/dbus-sync-host-name-resolver.c index e511327..b7e6ef7 100644 --- a/avahi-daemon/dbus-sync-host-name-resolver.c +++ b/avahi-daemon/dbus-sync-host-name-resolver.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-sync-service-resolver.c b/avahi-daemon/dbus-sync-service-resolver.c index ed7276a..73fb515 100644 --- a/avahi-daemon/dbus-sync-service-resolver.c +++ b/avahi-daemon/dbus-sync-service-resolver.c @@ -23,7 +23,7 @@ #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/dbus.h> #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/dbus-util.c b/avahi-daemon/dbus-util.c index 2983b29..994c5d3 100644 --- a/avahi-daemon/dbus-util.c +++ b/avahi-daemon/dbus-util.c @@ -31,7 +31,7 @@ #include <avahi-common/error.h> #include <avahi-common/dbus.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-core/log.h> #include <avahi-core/core.h> diff --git a/avahi-daemon/ini-file-parser-test.c b/avahi-daemon/ini-file-parser-test.c index 6ca6641..6c24fca 100644 --- a/avahi-daemon/ini-file-parser-test.c +++ b/avahi-daemon/ini-file-parser-test.c @@ -23,7 +23,7 @@ #include <stdio.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "ini-file-parser.h" diff --git a/avahi-daemon/ini-file-parser.c b/avahi-daemon/ini-file-parser.c index 0a99ce3..17359ae 100644 --- a/avahi-daemon/ini-file-parser.c +++ b/avahi-daemon/ini-file-parser.c @@ -26,7 +26,7 @@ #include <errno.h> #include <ctype.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-core/log.h> #include "ini-file-parser.h" diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index a645648..dc30fda 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -55,7 +55,7 @@ #include <libdaemon/dlog.h> #include <libdaemon/dpid.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/simple-watch.h> #include <avahi-common/error.h> #include <avahi-common/alternative.h> diff --git a/avahi-daemon/setproctitle.c b/avahi-daemon/setproctitle.c index e6f0941..c52a262 100644 --- a/avahi-daemon/setproctitle.c +++ b/avahi-daemon/setproctitle.c @@ -31,7 +31,7 @@ #include <sys/prctl.h> #endif -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "setproctitle.h" diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c index 3e0ebb1..ac4ac92 100644 --- a/avahi-daemon/simple-protocol.c +++ b/avahi-daemon/simple-protocol.c @@ -33,7 +33,7 @@ #include <sys/stat.h> #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include <avahi-core/log.h> diff --git a/avahi-daemon/static-hosts.c b/avahi-daemon/static-hosts.c index 34f531f..6e6def6 100644 --- a/avahi-daemon/static-hosts.c +++ b/avahi-daemon/static-hosts.c @@ -26,7 +26,7 @@ #include <stdio.h> #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include <avahi-core/log.h> #include <avahi-core/publish.h> diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c index 4c3491f..058b52b 100644 --- a/avahi-daemon/static-services.c +++ b/avahi-daemon/static-services.c @@ -39,7 +39,7 @@ #endif /* USE_BSDXML_H */ #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/alternative.h> #include <avahi-common/error.h> #include <avahi-common/domain.h> diff --git a/avahi-dnsconfd/main.c b/avahi-dnsconfd/main.c index 719fbeb..7682d1b 100644 --- a/avahi-dnsconfd/main.c +++ b/avahi-dnsconfd/main.c @@ -39,7 +39,7 @@ #include <stdlib.h> #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/address.h> #include <libdaemon/dfork.h> diff --git a/avahi-glib/glib-malloc.c b/avahi-glib/glib-malloc.c index 20ac1d1..db452cf 100644 --- a/avahi-glib/glib-malloc.c +++ b/avahi-glib/glib-malloc.c @@ -22,7 +22,7 @@ #endif #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "glib-malloc.h" diff --git a/avahi-glib/glib-malloc.h b/avahi-glib/glib-malloc.h index 8b189d2..be5cc27 100644 --- a/avahi-glib/glib-malloc.h +++ b/avahi-glib/glib-malloc.h @@ -25,7 +25,7 @@ #include <glib.h> #include <avahi-common/cdecl.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" AVAHI_C_DECL_BEGIN diff --git a/avahi-glib/glib-watch.c b/avahi-glib/glib-watch.c index 5b60bbc..9f7bdaa 100644 --- a/avahi-glib/glib-watch.c +++ b/avahi-glib/glib-watch.c @@ -22,7 +22,7 @@ #endif #include <avahi-common/llist.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/timeval.h> #include "glib-watch.h" diff --git a/avahi-gobject/ga-entry-group.c b/avahi-gobject/ga-entry-group.c index 101acbf..f04a797 100644 --- a/avahi-gobject/ga-entry-group.c +++ b/avahi-gobject/ga-entry-group.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "ga-error.h" #include "ga-entry-group.h" diff --git a/avahi-ui/bssh.c b/avahi-ui/bssh.c index 491380f..193b926 100644 --- a/avahi-ui/bssh.c +++ b/avahi-ui/bssh.c @@ -32,7 +32,7 @@ #include <avahi-client/client.h> #include <avahi-common/strlst.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/domain.h> #include <avahi-common/i18n.h> diff --git a/avahi-utils/avahi-browse.c b/avahi-utils/avahi-browse.c index 4101895..c23e5a5 100644 --- a/avahi-utils/avahi-browse.c +++ b/avahi-utils/avahi-browse.c @@ -34,7 +34,7 @@ #include <avahi-common/simple-watch.h> #include <avahi-common/error.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/domain.h> #include <avahi-common/llist.h> #include <avahi-common/i18n.h> diff --git a/avahi-utils/avahi-publish.c b/avahi-utils/avahi-publish.c index 485de3a..7cbf947 100644 --- a/avahi-utils/avahi-publish.c +++ b/avahi-utils/avahi-publish.c @@ -32,7 +32,7 @@ #include <avahi-common/simple-watch.h> #include <avahi-common/error.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/alternative.h> #include <avahi-common/i18n.h> #include <avahi-client/client.h> diff --git a/avahi-utils/avahi-resolve.c b/avahi-utils/avahi-resolve.c index bf1730b..6cd5600 100644 --- a/avahi-utils/avahi-resolve.c +++ b/avahi-utils/avahi-resolve.c @@ -33,7 +33,7 @@ #include <avahi-common/simple-watch.h> #include <avahi-common/error.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/domain.h> #include <avahi-common/llist.h> #include <avahi-common/i18n.h> diff --git a/avahi-utils/avahi-set-host-name.c b/avahi-utils/avahi-set-host-name.c index 34fbbeb..dd0cec8 100644 --- a/avahi-utils/avahi-set-host-name.c +++ b/avahi-utils/avahi-set-host-name.c @@ -32,7 +32,7 @@ #include <avahi-common/simple-watch.h> #include <avahi-common/error.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/domain.h> #include <avahi-common/i18n.h> #include <avahi-client/client.h> diff --git a/avahi-utils/stdb.c b/avahi-utils/stdb.c index 6602c97..c2815d9 100644 --- a/avahi-utils/stdb.c +++ b/avahi-utils/stdb.c @@ -30,7 +30,7 @@ #include <locale.h> #include <stdio.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include "stdb.h" diff --git a/docs/MALLOC b/docs/MALLOC index 7c452af..bfb8cbc 100644 --- a/docs/MALLOC +++ b/docs/MALLOC @@ -1,5 +1,5 @@ Avahi supports pluggable memory allocator implemenations. See -<avahi-common/malloc.h> for more information. +<avahi-common/avahi-malloc.h> for more information. Currently, Avahi does not deal well with out-of-memory situations. Therefore we recommend the usage of memory allocators that diff --git a/examples/client-browse-services.c b/examples/client-browse-services.c index f7ded2a..d11e6c5 100644 --- a/examples/client-browse-services.c +++ b/examples/client-browse-services.c @@ -30,7 +30,7 @@ #include <avahi-client/lookup.h> #include <avahi-common/simple-watch.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> static AvahiSimplePoll *simple_poll = NULL; diff --git a/examples/client-publish-service.c b/examples/client-publish-service.c index facc965..1334cc4 100644 --- a/examples/client-publish-service.c +++ b/examples/client-publish-service.c @@ -31,7 +31,7 @@ #include <avahi-common/alternative.h> #include <avahi-common/simple-watch.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> #include <avahi-common/timeval.h> diff --git a/examples/core-browse-services.c b/examples/core-browse-services.c index e062e3e..8860bd2 100644 --- a/examples/core-browse-services.c +++ b/examples/core-browse-services.c @@ -40,7 +40,7 @@ #include <avahi-core/core.h> #include <avahi-core/lookup.h> #include <avahi-common/simple-watch.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/error.h> static AvahiSimplePoll *simple_poll = NULL; diff --git a/examples/core-publish-service.c b/examples/core-publish-service.c index a78a464..8396553 100644 --- a/examples/core-publish-service.c +++ b/examples/core-publish-service.c @@ -29,7 +29,7 @@ #include <avahi-core/core.h> #include <avahi-core/publish.h> #include <avahi-common/simple-watch.h> -#include <avahi-common/malloc.h> +#include "avahi-common/avahi-malloc.h" #include <avahi-common/alternative.h> #include <avahi-common/error.h> |