aboutsummaryrefslogtreecommitdiff
path: root/avahi-common/domain-test.c
diff options
context:
space:
mode:
authorRobert Ginda <rginda@chromium.org>2015-08-04 15:24:15 -0700
committerRobert Ginda <rginda@chromium.org>2015-08-11 11:16:45 -0700
commit8e46e738cae449bf44232c66e973c8e9e15fbcb5 (patch)
tree79c6f758aaa9ae4de20ea966235f0c0272c88a4f /avahi-common/domain-test.c
parent57cc59c1868f186da5b9dc3fc63dbab3fe2ce54c (diff)
downloadavahi-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
Diffstat (limited to 'avahi-common/domain-test.c')
-rw-r--r--avahi-common/domain-test.c2
1 files changed, 1 insertions, 1 deletions
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;