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

7 files changed, 7 insertions, 7 deletions

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,