merge of '92c36bfdbc6468d1711c043b530e0dfe5abb6dec'

     and 'c22c8c43f8f68b0bffd4d5ccdb2282c958268742'

1 files changed, 4 insertions, 4 deletions

diff --git a/libdw/libdw.h b/libdw/libdw.h
index 53853127..70a35b04 100644
--- a/libdw/libdw.h
+++ b/libdw/libdw.h
@@ -62,9 +62,9 @@
 #endif
 
 #ifdef __GNUC_STDC_INLINE__
-# define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
+# define __libdw_extern_inline extern __inline __attribute__ ((__gnu_inline__))
 #else
-# define __extern_inline extern __inline
+# define __libdw_extern_inline extern __inline
 #endif
 
 
@@ -630,14 +630,14 @@ extern Dwarf_OOM dwarf_new_oom_handler (Dwarf *dbg, Dwarf_OOM handler);
 /* Inline optimizations.  */
 #ifdef __OPTIMIZE__
 /* Return attribute code of given attribute.  */
-__extern_inline unsigned int
+__libdw_extern_inline unsigned int
 dwarf_whatattr (Dwarf_Attribute *attr)
 {
   return attr == NULL ? 0 : attr->code;
 }
 
 /* Return attribute code of given attribute.  */
-__extern_inline unsigned int
+__libdw_extern_inline unsigned int
 dwarf_whatform (Dwarf_Attribute *attr)
 {
   return attr == NULL ? 0 : attr->form;