From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 15 Oct 2005 15:53:46 +0000 (+0000)
Subject: reflect changes made in HOWL compat layer version of warn.[hc]
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=799c3952af4b656dfe558ae3feaa8df139a2912d;p=catta

reflect changes made in HOWL compat layer version of warn.[hc]


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@770 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---

diff --git a/avahi-compat-howl/warn.h b/avahi-compat-howl/warn.h
index 13dbb31..785dba4 100644
--- a/avahi-compat-howl/warn.h
+++ b/avahi-compat-howl/warn.h
@@ -22,8 +22,13 @@
   USA.
 ***/
 
+/* To avoid symbol name clashes when a process links to both our
+ * compatiblity layers, we move the symbols out of the way here */
+
 #define avahi_warn_unsupported avahi_warn_unsupported_HOWL
 #define avahi_warn_linkage avahi_warn_linkage_HOWL
+#define avahi_warn avahi_warn_HOWL
+#define avahi_exe_name avahi_exe_name_HOWL
 
 #include "../avahi-compat-libdns_sd/warn.h"